devfile 0.0.6.pre.alpha1 → 0.0.8.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf831a17544808ad5c6aeaa40396c1edab81d222b9877e7f4e832c6ac841979
-  data.tar.gz: 602f3f0d6cdf223bcf5e5cfa85847c04292a7740df932ee697d8b09f9da7c76d
+  metadata.gz: 408383897339e9fd708262410bc2ce2a94003c59c5c232e46ccc69c330e142c2
+  data.tar.gz: 5adda218df4d0705738fe4bc5f2050db97e3a4e534b2c5b38b81d82c91438499
 SHA512:
-  metadata.gz: 6f9bf80170c790f16adcc9f418e64063e5f8b902cf407539ef435504ad55c3220b71adad13865e80ac052270a4f915863ed141427e4420bf5201326c74045206
-  data.tar.gz: 84e784722a571e61716488ccba1dd055e34c557965148981c1c71aafe1b59979a0b4d453eca8aad2c8a1663eda2caac610a9bcd00a299217174eeae9625a1282
+  metadata.gz: 5602bc277edab5c235fc6898614ef2277a148d16e8d3187d8fee550f2095c9491e0119dde98502699756917f165109f994e554eecd940133ca6759c78769da5f
+  data.tar.gz: 14c1ffac2a950b504f786c8884e432fbc7a98d60547115fa050b3ecbf62a1aa093f0ff900a233d7200d1529157c9b83886bb2821399b26806856b29fe360f7bb

data/ext/devfile.go

@@ -9,6 +9,8 @@ import (
 	"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"
@@ -20,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
@@ -52,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),
@@ -65,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, domainTemplate, 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
@@ -75,7 +82,10 @@ func (d Devfile) getIngress(name, namespace string, labels, annotations map[stri
 	var rules []networkingv1.IngressRule
 
 	// Create a new template and parse the letter into it.
-	t := template.Must(template.New("domainTemplate").Parse(domainTemplate))
+	t, err := template.New("domainTemplate").Parse(domainTemplate)
+	if err != nil {
+		return nil, err
+	}
 
 	for _, component := range components {
 		for _, endpoint := range component.Container.Endpoints {
@@ -113,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,
@@ -144,20 +147,30 @@ func (d Devfile) getIngress(name, namespace string, labels, annotations map[stri
 }
 
 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
 	}
+	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, domainTemplate, 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, 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, domainTemplate, 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, 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
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devfile
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre.alpha1
+  version: 0.0.8.pre.alpha1
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-17 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.4.7
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Parse and generate kubernetes manifests from a Devfile