devfile 0.0.4.pre.alpha1-arm64-darwin → 0.0.5.pre.alpha1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4a0cbfc19ce498b326dd1965e0e1c0b6bd0770c0be0883d0dc2a25b8a64cb02
-  data.tar.gz: d6faa2a25ebb91b46210c94a7781aef81c1f448e15cafa4e8cd515fc419ad212
+  metadata.gz: 7213c30bd262a47cc7230b2766d8af2af0d2d9e14f13d5deede4c80fc565abd7
+  data.tar.gz: 14fb2059088725869adfb122c9da334d2890220be97dd46ec39eca2f9d502941
 SHA512:
-  metadata.gz: 2cdb63e4378984c54e7819a65f55004ade1b6999aa019b3dc8baf1cc5bd5ca3792c25956c5c15c19f8187a5785be53ea6b081a64f5de7ab3be02d622184bd2b3
-  data.tar.gz: 69eb6890060ec6fae9c16f9ff6d2f9bf7e3ae216803af4540737a3c7bc751d488a280c9fc51e938c9df0ff06da70383f92ad5dbb83a1d98945721c5491844474
+  metadata.gz: 3b0f12ae00f9f5752cb2da4c4805ce2323a7b0c79ce021a311a576ffea9d3436fbbeba04eab05037a7cf1b5cb9818461436e9ae5b3c2b55199b2a770d25c118f
+  data.tar.gz: d483b86fd468e4d42104e7596b2e1a228de720a2b00889b34d43869f7817b667832f2e5d467f3bfa04444537c5ce922fb610dc44f17c6ffb8d0d914e3e222348

data/ext/devfile.go

@@ -3,7 +3,9 @@ package main
 import "C"
 import (
 	"bytes"
-	"fmt"
+	"strconv"
+	"text/template"
+
 	"github.com/devfile/library/v2/pkg/devfile/generator"
 	"github.com/devfile/library/v2/pkg/devfile/parser"
 	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
@@ -63,7 +65,7 @@ func (d Devfile) getService(name, namespace string, labels, annotations map[stri
 	return service, err
 }
 
-func (d Devfile) getIngress(name, namespace string, labels, annotations map[string]string, domainSuffix, ingressClass string) (runtime.Object, error) {
+func (d Devfile) getIngress(name, namespace string, labels, annotations map[string]string, domainTemplate, ingressClass string) (runtime.Object, error) {
 	components, err := d.devfileObj.Data.GetDevfileContainerComponents(common.DevfileOptions{})
 	if err != nil {
 		return nil, err
@@ -72,12 +74,19 @@ func (d Devfile) getIngress(name, namespace string, labels, annotations map[stri
 	var hosts []string
 	var rules []networkingv1.IngressRule
 
+	// Create a new template and parse the letter into it.
+	t := template.Must(template.New("domainTemplate").Parse(domainTemplate))
+
 	for _, component := range components {
 		for _, endpoint := range component.Container.Endpoints {
-			domain := fmt.Sprintf("%d-%s-%s.%s", endpoint.TargetPort, endpoint.Name, name, domainSuffix)
-			hosts = append(hosts, domain)
+			var domain bytes.Buffer
+			err := t.Execute(&domain, map[string]string{"port": strconv.Itoa(endpoint.TargetPort)})
+			if err != nil {
+				return nil, err
+			}
+			hosts = append(hosts, domain.String())
 			rules = append(rules, networkingv1.IngressRule{
-				Host: domain,
+				Host: domain.String(),
 				IngressRuleValue: networkingv1.IngressRuleValue{
 					HTTP: &networkingv1.HTTPIngressRuleValue{
 						Paths: []networkingv1.HTTPIngressPath{
@@ -134,7 +143,7 @@ func (d Devfile) getIngress(name, namespace string, labels, annotations map[stri
 	return ingress, nil
 }
 
-func (d Devfile) getAll(name, namespace string, labels, annotations map[string]string, replicas int, domainSuffix, ingressClass string) ([]runtime.Object, error) {
+func (d Devfile) getAll(name, namespace string, labels, annotations map[string]string, replicas int, domainTemplate, ingressClass string) ([]runtime.Object, error) {
 	deployment, err := d.getDeployment(name, namespace, labels, annotations, replicas)
 	if err != nil {
 		return nil, err
@@ -143,7 +152,7 @@ func (d Devfile) getAll(name, namespace string, labels, annotations map[string]s
 	if err != nil {
 		return nil, err
 	}
-	ingress, err := d.getIngress(name, namespace, labels, annotations, domainSuffix, ingressClass)
+	ingress, err := d.getIngress(name, namespace, labels, annotations, domainTemplate, ingressClass)
 	if err != nil {
 		return nil, err
 	}

data/ext/main.go

@@ -123,7 +123,7 @@ func getService(devfile, name, namespace, labelsStr, annotationsStr string) Resu
 	return Result{content, nil}
 }
 
-func getIngress(devfile, name, namespace, labelsStr, annotationsStr, domainSuffix, ingressClass string) Result {
+func getIngress(devfile, name, namespace, labelsStr, annotationsStr, domainTemplate, ingressClass string) Result {
 	d, err := parseDevfile(devfile)
 	if err != nil {
 		return Result{"", err}
@@ -143,7 +143,7 @@ func getIngress(devfile, name, namespace, labelsStr, annotationsStr, domainSuffi
 	if err != nil {
 		return Result{"", err}
 	}
-	ingress, err := d.getIngress(name, namespace, labels, annotations, domainSuffix, ingressClass)
+	ingress, err := d.getIngress(name, namespace, labels, annotations, domainTemplate, ingressClass)
 	if err != nil {
 		return Result{"", err}
 	}
@@ -154,7 +154,7 @@ func getIngress(devfile, name, namespace, labelsStr, annotationsStr, domainSuffi
 	return Result{content, nil}
 }
 
-func getAll(devfile string, name, namespace, labelsStr, annotationsStr, replicas, domainSuffix, ingressClass string) Result {
+func getAll(devfile string, name, namespace, labelsStr, annotationsStr, replicas, domainTemplate, ingressClass string) Result {
 	d, err := parseDevfile(devfile)
 	if err != nil {
 		return Result{"", err}
@@ -178,7 +178,7 @@ func getAll(devfile string, name, namespace, labelsStr, annotationsStr, replicas
 	if err != nil {
 		return Result{"", err}
 	}
-	resources, err := d.getAll(name, namespace, labels, annotations, replicasInt, domainSuffix, ingressClass)
+	resources, err := d.getAll(name, namespace, labels, annotations, replicasInt, domainTemplate, ingressClass)
 	if err != nil {
 		return Result{"", err}
 	}

data/lib/devfile.rb

@@ -10,7 +10,9 @@ module Devfile
 
     class << self
       def get_deployment(devfile, name, namespace, labels, annotations, replicas)
-        stdout, stderr, status = Open3.capture3("#{FILE_PATH} deployment '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{replicas}")
+        stdout, stderr, status = Open3.capture3(
+          "#{FILE_PATH} deployment '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{replicas}"
+        )
 
         raise stderr unless status.success?
 
@@ -18,24 +20,28 @@ module Devfile
       end
 
       def get_service(devfile, name, namespace, labels, annotations)
-        stdout, stderr, status = Open3.capture3("#{FILE_PATH} service '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}'")
+        stdout, stderr, status = Open3.capture3(
+          "#{FILE_PATH} service '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}'"
+        )
 
         raise stderr unless status.success?
 
         stdout
       end
 
-      def get_ingress(devfile, name, namespace, labels, annotations, domain_suffix, ingress_class)
-        stdout, stderr, status = Open3.capture3("#{FILE_PATH} ingress '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{domain_suffix} #{ingress_class}")
+      def get_ingress(devfile, name, namespace, labels, annotations, domain_template, ingress_class)
+        stdout, stderr, status = Open3.capture3(
+          "#{FILE_PATH} ingress '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{domain_template} #{ingress_class}"
+        )
 
         raise stderr unless status.success?
 
         stdout
       end
 
-      def get_all(devfile, name, namespace, labels, annotations, replicas, domain_suffix, ingress_class)
+      def get_all(devfile, name, namespace, labels, annotations, replicas, domain_template, ingress_class)
         stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} all '#{devfile}' #{name} #{namespace}  '#{labels}' '#{annotations}' #{replicas} #{domain_suffix} #{ingress_class}"
+          "#{FILE_PATH} all '#{devfile}' #{name} #{namespace}  '#{labels}' '#{annotations}' #{replicas} #{domain_template} #{ingress_class}"
         )
 
         raise stderr unless status.success?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devfile
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.alpha1
+  version: 0.0.5.pre.alpha1
 platform: arm64-darwin
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Library used to generate kubernetes manifests from a Devfile.
 email: spatnaik@gitlab.com