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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4a0cbfc19ce498b326dd1965e0e1c0b6bd0770c0be0883d0dc2a25b8a64cb02
-  data.tar.gz: d6faa2a25ebb91b46210c94a7781aef81c1f448e15cafa4e8cd515fc419ad212
+  metadata.gz: 022c2013340f8ac58d39c78763e2820e5ecdbde4b4bfad366756a4c018ad610c
+  data.tar.gz: f3f50f92496f1361859f2140f264fc17817aa4f2d80c7608f12270a84a869c40
 SHA512:
-  metadata.gz: 2cdb63e4378984c54e7819a65f55004ade1b6999aa019b3dc8baf1cc5bd5ca3792c25956c5c15c19f8187a5785be53ea6b081a64f5de7ab3be02d622184bd2b3
-  data.tar.gz: 69eb6890060ec6fae9c16f9ff6d2f9bf7e3ae216803af4540737a3c7bc751d488a280c9fc51e938c9df0ff06da70383f92ad5dbb83a1d98945721c5491844474
+  metadata.gz: 78758a78eb281a2ed9e65230425a33fb43b1b0da61419351e73efe154a47aee552dee439d9b0ad45f6fb307bdb5f35dbf435925c3ac6add0f35534b25ba1c1a9
+  data.tar.gz: 06e0da12b3a91d20e53cfcc1d500cdc03c73e8121047b35af1ce5ca3d7e8ca62b72785c5f37ead01eadd181ad8d7078297744525c77b0dafae2abfea654884f3

data/ext/devfile.go

@@ -3,10 +3,14 @@ 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"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -18,7 +22,7 @@ type Devfile struct {
 	devfileObj parser.DevfileObj
 }
 
-func (d Devfile) getDeployment(name, namespace string, labels, annotations map[string]string, replicas int) (runtime.Object, error) {
+func (d Devfile) getDeployment(name, namespace string, labels, annotations map[string]string, replicas int) (*appsv1.Deployment, error) {
 	containers, err := generator.GetContainers(d.devfileObj, common.DevfileOptions{})
 	if err != nil {
 		return nil, err
@@ -50,7 +54,7 @@ func (d Devfile) getDeployment(name, namespace string, labels, annotations map[s
 	return deployment, err
 }
 
-func (d Devfile) getService(name, namespace string, labels, annotations map[string]string) (runtime.Object, error) {
+func (d Devfile) getService(name, namespace string, labels, annotations map[string]string) (*corev1.Service, error) {
 	service, err := generator.GetService(d.devfileObj, generator.ServiceParams{
 		TypeMeta:       generator.GetTypeMeta("Service", "v1"),
 		ObjectMeta:     generator.GetObjectMeta(name, namespace, labels, annotations),
@@ -63,7 +67,12 @@ 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) (*networkingv1.Ingress, error) {
+
+	if ingressClass == "none" {
+		return nil, nil
+	}
+
 	components, err := d.devfileObj.Data.GetDevfileContainerComponents(common.DevfileOptions{})
 	if err != nil {
 		return nil, err
@@ -72,12 +81,22 @@ 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, err := template.New("domainTemplate").Parse(domainTemplate)
+	if err != nil {
+		return nil, err
+	}
+
 	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{
@@ -104,23 +123,16 @@ func (d Devfile) getIngress(name, namespace string, labels, annotations map[stri
 		return nil, nil
 	}
 
-	// since annotations is a map, it is passed by reference in go
-	// hence to modify it, create a new copy
-	ingressAnnotations := map[string]string{
-		"kubernetes.io/ingress.class": ingressClass,
-	}
-	for k, v := range annotations {
-		ingressAnnotations[k] = v
-	}
 	ingress := &networkingv1.Ingress{
 		TypeMeta: generator.GetTypeMeta("Ingress", "networking.k8s.io/v1"),
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        name,
 			Namespace:   namespace,
 			Labels:      labels,
-			Annotations: ingressAnnotations,
+			Annotations: annotations,
 		},
 		Spec: networkingv1.IngressSpec{
+			IngressClassName: &ingressClass,
 			//TLS: []networkingv1.IngressTLS{
 			//	{
 			//		Hosts:      hosts,
@@ -134,21 +146,31 @@ 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) {
+
+	var result []runtime.Object
+
 	deployment, err := d.getDeployment(name, namespace, labels, annotations, replicas)
 	if err != nil {
 		return nil, err
 	}
+	result = append(result, deployment)
+
 	service, err := d.getService(name, namespace, labels, annotations)
 	if err != nil {
 		return nil, err
 	}
-	ingress, err := d.getIngress(name, namespace, labels, annotations, domainSuffix, ingressClass)
+	result = append(result, service)
+
+	ingress, err := d.getIngress(name, namespace, labels, annotations, domainTemplate, ingressClass)
 	if err != nil {
 		return nil, err
 	}
+	if ingress != nil {
+		result = append(result, ingress)
+	}
 
-	return []runtime.Object{deployment, service, ingress}, nil
+	return result, nil
 }
 
 func (d Devfile) hasContainerComponents() (bool, error) {

data/ext/main.go

@@ -9,11 +9,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-type Result struct {
-	content string
-	err     error
-}
-
 func main() {
 	args := os.Args
 
@@ -25,27 +20,28 @@ func main() {
 	fnName := os.Args[1]
 	devfile := os.Args[2]
 
-	var result Result
+	var content string
+	var err error
 
 	switch fnName {
 	case "deployment":
-		result = getDeployment(devfile, args[3], args[4], args[5], args[6], args[7])
+		content, err = getDeployment(devfile, args[3], args[4], args[5], args[6], args[7])
 	case "service":
-		result = getService(devfile, args[3], args[4], args[5], args[6])
+		content, err = getService(devfile, args[3], args[4], args[5], args[6])
 	case "ingress":
-		result = getIngress(devfile, args[3], args[4], args[5], args[6], args[7], args[8])
+		content, err = getIngress(devfile, args[3], args[4], args[5], args[6], args[7], args[8])
 	case "all":
-		result = getAll(devfile, args[3], args[4], args[5], args[6], args[7], args[8], args[9])
+		content, err = getAll(devfile, args[3], args[4], args[5], args[6], args[7], args[8], args[9])
 	case "flatten":
-		result = flatten(devfile)
+		content, err = flatten(devfile)
 	}
 
-	if result.err != nil {
-		fmt.Fprint(os.Stderr, result.err)
+	if err != nil {
+		fmt.Fprint(os.Stderr, err)
 		os.Exit(1)
 	}
 
-	fmt.Print(result.content)
+	fmt.Print(content)
 }
 
 func unmarshalKeyValuePair(data string) (map[string]string, error) {
@@ -57,147 +53,152 @@ func unmarshalKeyValuePair(data string) (map[string]string, error) {
 	return values, err
 }
 
-func getDeployment(devfile, name, namespace, labelsStr, annotationsStr, replicas string) Result {
+func getDeployment(devfile, name, namespace, labelsStr, annotationsStr, replicas string) (string, error) {
 	d, err := parseDevfile(devfile)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	exists, err := d.hasContainerComponents()
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	if exists == false {
-		return Result{"", err}
+		return "", err
 	}
 	labels, err := unmarshalKeyValuePair(labelsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	annotations, err := unmarshalKeyValuePair(annotationsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	replicasInt, err := strconv.Atoi(replicas)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	deployment, err := d.getDeployment(name, namespace, labels, annotations, replicasInt)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	content, err := marshalResources([]runtime.Object{deployment})
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
-	return Result{content, nil}
+	return content, nil
 }
 
-func getService(devfile, name, namespace, labelsStr, annotationsStr string) Result {
+func getService(devfile, name, namespace, labelsStr, annotationsStr string) (string, error) {
 	d, err := parseDevfile(devfile)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	exists, err := d.hasContainerComponents()
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	if exists == false {
-		return Result{"", err}
+		return "", err
 	}
 	labels, err := unmarshalKeyValuePair(labelsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	annotations, err := unmarshalKeyValuePair(annotationsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	service, err := d.getService(name, namespace, labels, annotations)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	content, err := marshalResources([]runtime.Object{service})
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
-	return Result{content, nil}
+	return content, nil
 }
 
-func getIngress(devfile, name, namespace, labelsStr, annotationsStr, domainSuffix, ingressClass string) Result {
+func getIngress(devfile, name, namespace, labelsStr, annotationsStr, domainTemplate, ingressClass string) (string, error) {
 	d, err := parseDevfile(devfile)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	exists, err := d.hasContainerComponents()
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	if exists == false {
-		return Result{"", err}
+		return "", err
 	}
 	labels, err := unmarshalKeyValuePair(labelsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	annotations, err := unmarshalKeyValuePair(annotationsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", 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}
+		return "", err
 	}
+
+	if ingress == nil {
+		return "", nil
+	}
+
 	content, err := marshalResources([]runtime.Object{ingress})
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
-	return Result{content, nil}
+	return 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) (string, error) {
 	d, err := parseDevfile(devfile)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	exists, err := d.hasContainerComponents()
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	if exists == false {
-		return Result{"", err}
+		return "", err
 	}
 	labels, err := unmarshalKeyValuePair(labelsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	annotations, err := unmarshalKeyValuePair(annotationsStr)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	replicasInt, err := strconv.Atoi(replicas)
 	if err != nil {
-		return Result{"", err}
+		return "", 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}
+		return "", err
 	}
 	content, err := marshalResources(resources)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
-	return Result{content, nil}
+	return content, nil
 }
 
-func flatten(devfile string) Result {
+func flatten(devfile string) (string, error) {
 	d, err := parseDevfile(devfile)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
 	flattenedDevfile := d.getFlattenedDevfileContent()
 	content, err := marshalDevfile(flattenedDevfile)
 	if err != nil {
-		return Result{"", err}
+		return "", err
 	}
-	return Result{content, nil}
+	return content, 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,17 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: devfile
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.alpha1
+  version: 0.0.11.pre.alpha1
 platform: arm64-darwin
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies: []
 description: Library used to generate kubernetes manifests from a Devfile.
-email: spatnaik@gitlab.com
+email:
+- cwoolley@gitlab.com
+- vtak@gitlab.com
+- spatnaik@gitlab.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -43,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Parse and generate kubernetes manifests from a Devfile