devfile 0.0.4.pre.alpha1 → 0.0.5.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68fe0dafd8b89c774342888d1a56ee69357492ef1f7c800695c2cf0e160fc40d
-  data.tar.gz: ed969d122de436b5d6ad9dec8385e92623921f888ee7ab7b29d882c3abb5dc6b
+  metadata.gz: 217f6ef16fae08c970f0deca2170388904be0dfa018009bd04720f5f151253f3
+  data.tar.gz: eb54d576b5a9765a21dd3281e12eb3e6698decb96bcc9c61cf09245f717b3536
 SHA512:
-  metadata.gz: 914809b92174b11f397c3218ca2d7b12ffbad7abba4a6489864a90df0fcb13a72b9711c87dc538a560718db823ac8475fff3221bdd6137b5e477795d5c49b866
-  data.tar.gz: a462a444b95b7cbe6fd76fb375a58384dbac3870fee69487273d8c46b61941f8b3cbabad844e3f6d1ec3deb25f3738f0fdb468f95ca99177c05becc2bf0b0674
+  metadata.gz: 840e63e69a28ad6db6e0a0db98cf09f1496afa36642e80fea7fcdd74e3b61356f1b50572d786029e23f6d90f21127db263f89cb100a5644841bb67e2beafa108
+  data.tar.gz: 396492fc86f1bade988e251f87ca06a4410bd2c2fa865d074d9734da9aedbf552975bac4d968a2cc6853e82d43f22b7ab48ae9612e25796dc20e6e6453f2908d

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: ruby
 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
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Parse and generate kubernetes manifests from a Devfile