devfile 0.0.6.pre.alpha1-x86_64-linux → 0.0.11.pre.alpha1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb435b8f1497c4dbfbb5f8baa9cb61823eeae8d555a7a71a80d041dda1f4b537
-  data.tar.gz: ce594d2dc04ffaa2a0e63257c6251b5ca41be907bcecb1ffd804afe48f478fab
+  metadata.gz: 1791e8e7ff6b1f3de970040c705db46fef04cfb524b95f1e0a41d57f97e6d61d
+  data.tar.gz: 26ede5ee22624b25fa8142879703a1c80b0fd78bf7e6598da89eec1c4310afbe
 SHA512:
-  metadata.gz: 60c599546b8e91f593d9400a79c39f87f3e07c3660649d254d3f587078cafdd3daeab8bfac632900680834b32524b1ac735e5e26dcd0a44fbcbc75ffdc928339
-  data.tar.gz: 5f69f2979faf1a0900be36a467ec4c70636892b11b6107dae73f5ca7c603922d8f1e760013a0eeac7cfce842f8e0fe69a4fd5405b5616f074d85fa66a7197a48
+  metadata.gz: cfba06a846d7ec1a8c18b51cf86d4ff1c96af5ccef21df42e21ddfe0004bcbefabc4fde89c86c67077c1769b44a0a3d4ef7cd237278324b6c26090d8fd2e3b8d
+  data.tar.gz: de8183ccfddadb4e3e59a21df545cedcd2b59967c3be488bccf93e8882c37e8e3bc728dbb670dbc62e15460b9f7bfa35ac517acb89421ea24569dcf140a21e19

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.11.pre.alpha1
 platform: x86_64-linux
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies: []
 description: Library used to generate kubernetes manifests from a Devfile.
 email: spatnaik@gitlab.com