Fix feedback

Kuadrant · Nov 8, 2024 · d4e87de · d4e87de
1 parent 53ffb50
commit d4e87de
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 102 deletions.
diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml
@@ -5,6 +5,6 @@ commonLabels:
   deployment: kuadrant-helm-deploy
 
 resources:
-  - ../tasks/
+  - ../tasks/deploy
   - pipeline.yaml
   - pipeline-nightly-update.yaml
diff --git a/deploy/pipeline-nightly-update.yaml b/deploy/pipeline-nightly-update.yaml
@@ -8,7 +8,7 @@ spec:
     name: kube-api
     type: string
   - description: Istio deployment. Only these values 'sail', 'ossm', 'ossm3'
-    name: istioProvider
+    name: istio-provider
     type: string
     default: sail
   tasks:
@@ -24,7 +24,7 @@ spec:
     - name: kube-api
       value: $(params.kube-api)
     - name: testsuite-image
-      value: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      value: quay.io/rhn_support_azgabur/alpine/k8s:latest
     taskRef:
       kind: Task
       name: kubectl-login
@@ -43,8 +43,8 @@ spec:
       workspace: shared-workspace
   - name: helm-install-nightly
     params:
-      - name: istioProvider
-        value: $(params.istioProvider)
+      - name: istio-provider
+        value: $(params.istio-provider)
     runAfter:
     - helm-uninstall
     taskRef:

diff --git a/deploy/pipeline.yaml b/deploy/pipeline.yaml
@@ -8,15 +8,15 @@ spec:
     name: kube-api
     type: string
   - description: Kuadrant image url
-    name: indexImage
+    name: index-image
     type: string
     default: quay.io/kuadrant/kuadrant-operator-catalog:v0.11.0
   - description: Kuadrant image channel. Can be 'preview' for nightlies and 'stable' for releases
     name: channel
     type: string
     default: stable
   - description: Istio deployment. Only these values 'sail', 'ossm', 'ossm3'
-    name: istioProvider
+    name: istio-provider
     type: string
     default: sail
   tasks:
@@ -32,7 +32,7 @@ spec:
     - name: kube-api
       value: $(params.kube-api)
     - name: testsuite-image
-      value: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      value: quay.io/rhn_support_azgabur/alpine/k8s:latest
     taskRef:
       kind: Task
       name: kubectl-login
@@ -51,12 +51,12 @@ spec:
       workspace: shared-workspace
   - name: helm-install
     params:
-      - name: indexImage
-        value: $(params.indexImage)
+      - name: index-image
+        value: $(params.index-image)
       - name: channel
         value: $(params.channel)
-      - name: istioProvider
-        value: $(params.istioProvider)
+      - name: istio-provider
+        value: $(params.istio-provider)
     runAfter:
     - helm-uninstall
     taskRef:

diff --git a/tasks/01-clone.yaml b/tasks/01-clone.yaml
diff --git a/tasks/deploy/clone-task.yaml b/tasks/deploy/clone-task.yaml
@@ -0,0 +1,25 @@
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: clone
+spec:
+  steps:
+  - name: clone
+    args:
+      - >-
+        git clone 
+        -b main 
+        --depth '1' 
+        https://github.com/azgabur/kuadrant-helm-install 
+        $(workspaces.shared-workspace.path)/kuadrant-helm-install
+    command:
+      - /bin/bash
+      - -c
+    computeResources:
+      limits:
+        cpu: 250m
+        memory: 128Mi
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
+    imagePullPolicy: IfNotPresent
+  workspaces:
+  - name: shared-workspace
diff --git a/tasks/03-helm-install-nightly.yaml → tasks/deploy/helm-install-nightly-task.yaml b/tasks/03-helm-install-nightly.yaml → tasks/deploy/helm-install-nightly-task.yaml
@@ -5,9 +5,8 @@ metadata:
 spec:
   params:
     - description: Istio deployment. Only these values 'sail', 'ossm', 'ossm3'
-      name: istioProvider
+      name: istio-provider
       type: string
-      default: sail
   steps:
   - name: helm-install-operators
     args:
@@ -19,7 +18,7 @@ spec:
         --values=/mount/values-additional-manifests/additionalManifests.yaml
         --set=kuadrant.indexImage=quay.io/kuadrant/kuadrant-operator-catalog:nightly-$(date +%d-%m-%Y)
         --set=kuadrant.channel=preview
-        --set=istio.istioProvider=$(params.istioProvider)
+        --set=istio.istioProvider=$(params.istio-provider)
         --set=tools.enabled=true
         --wait
         --debug
@@ -34,7 +33,7 @@ spec:
     env:
       - name: KUBECONFIG
         value: $(workspaces.shared-workspace.path)/kubeconfig
-    image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
     imagePullPolicy: IfNotPresent
   - name: helm-install-instances
     args:
@@ -46,7 +45,7 @@ spec:
         --values=/mount/values-additional-manifests/additionalManifests.yaml
         --set=kuadrant.indexImage=quay.io/kuadrant/kuadrant-operator-catalog:nightly-$(date +%d-%m-%Y)
         --set=kuadrant.channel=preview
-        --set=istio.istioProvider=$(params.istioProvider)
+        --set=istio.istioProvider=$(params.istio-provider)
         --set=tools.enabled=true
         --wait
         --debug
@@ -61,7 +60,7 @@ spec:
     env:
       - name: KUBECONFIG
         value: $(workspaces.shared-workspace.path)/kubeconfig
-    image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
     imagePullPolicy: IfNotPresent
   - name: run-hack-sh
     args:
@@ -71,7 +70,7 @@ spec:
     env:
       - name: KUBECONFIG
         value: $(workspaces.shared-workspace.path)/kubeconfig
-    image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
     imagePullPolicy: IfNotPresent
   volumes:
     - secret:

diff --git a/tasks/04-helm-install.yaml → tasks/deploy/helm-install-task.yaml b/tasks/04-helm-install.yaml → tasks/deploy/helm-install-task.yaml
@@ -5,63 +5,66 @@ metadata:
 spec:
   params:
     - description: Kuadrant image url
-      name: indexImage
+      name: index-image
       type: string
     - description: Kuadrant image channel. Can be 'preview' for nightlies and 'stable' for releases
       name: channel
       type: string
     - description: Istio deployment. Only these values 'sail', 'ossm', 'ossm3'
-      name: istioProvider
+      name: istio-provider
       type: string
-      default: sail
   steps:
   - name: helm-install-operators
     args:
-      - install
-      - -n=default
-      - --values=$(workspaces.shared-workspace.path)/kuadrant-helm-install/values.yaml
-      - --values=/mount/values-additional-manifests/additionalManifests.yaml
-      - --set=kuadrant.indexImage=$(params.indexImage)
-      - --set=kuadrant.channel=$(params.channel)
-      - --set=istio.istioProvider=$(params.istioProvider)
-      - --set=tools.enabled=true
-      - --wait
-      - --debug
-      - kuadrant-operators
-      - $(workspaces.shared-workspace.path)/kuadrant-helm-install/operators/
+      - >-
+        helm install
+        -n=default
+        --values=$(workspaces.shared-workspace.path)/kuadrant-helm-install/values.yaml
+        --values=/mount/values-additional-manifests/additionalManifests.yaml
+        --set=kuadrant.indexImage=$(params.index-image)
+        --set=kuadrant.channel=$(params.channel)
+        --set=istio.istioProvider=$(params.istio-provider)
+        --set=tools.enabled=true
+        --wait
+        --debug
+        kuadrant-operators
+        $(workspaces.shared-workspace.path)/kuadrant-helm-install/operators/
     command:
-      - helm
+      - /bin/bash
+      - -c
     volumeMounts:
       - mountPath: /mount/values-additional-manifests
         name: values-additional-manifests
     env:
       - name: KUBECONFIG
         value: $(workspaces.shared-workspace.path)/kubeconfig
-    image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
     imagePullPolicy: IfNotPresent
   - name: helm-install-instances
     args:
-      - install
-      - -n=default
-      - --values=$(workspaces.shared-workspace.path)/kuadrant-helm-install/values.yaml
-      - --values=/mount/values-additional-manifests/additionalManifests.yaml
-      - --set=kuadrant.indexImage=$(params.indexImage)
-      - --set=kuadrant.channel=$(params.channel)
-      - --set=istio.istioProvider=$(params.istioProvider)
-      - --set=tools.enabled=true
-      - --wait
-      - --debug
-      - kuadrant-instances
-      - $(workspaces.shared-workspace.path)/kuadrant-helm-install/instances/
+      - >-
+        helm install
+        -n=default
+        --values=$(workspaces.shared-workspace.path)/kuadrant-helm-install/values.yaml
+        --values=/mount/values-additional-manifests/additionalManifests.yaml
+        --set=kuadrant.indexImage=$(params.index-image)
+        --set=kuadrant.channel=$(params.channel)
+        --set=istio.istioProvider=$(params.istio-provider)
+        --set=tools.enabled=true
+        --wait
+        --debug
+        kuadrant-instances
+        $(workspaces.shared-workspace.path)/kuadrant-helm-install/instances/
     command:
-      - helm
+      - /bin/bash
+      - -c
     volumeMounts:
       - mountPath: /mount/values-additional-manifests
         name: values-additional-manifests
     env:
       - name: KUBECONFIG
         value: $(workspaces.shared-workspace.path)/kubeconfig
-    image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
     imagePullPolicy: IfNotPresent
   - name: run-hack-sh
     args:
@@ -71,7 +74,7 @@ spec:
     env:
       - name: KUBECONFIG
         value: $(workspaces.shared-workspace.path)/kubeconfig
-    image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+    image: quay.io/rhn_support_azgabur/alpine/k8s:latest
     imagePullPolicy: IfNotPresent
   volumes:
     - secret:

diff --git a/tasks/deploy/kustomization.yaml b/tasks/deploy/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - clone-task.yaml
+  - uninstall-task.yaml
+  - helm-install-nightly-task.yaml
+  - helm-install-task.yaml
diff --git a/tasks/02-uninstall.yaml → tasks/deploy/uninstall-task.yaml b/tasks/02-uninstall.yaml → tasks/deploy/uninstall-task.yaml
@@ -6,44 +6,46 @@ spec:
   steps:
     - name: uninstall-instances
       args:
-        - uninstall
-        - -n=default
-        - --ignore-not-found
-        - --wait
-        - kuadrant-instances
+        - >-
+          helm uninstall 
+          -n=default 
+          --ignore-not-found 
+          --wait 
+          kuadrant-instances
       command:
-        - helm
+        - /bin/bash
+        - -c
       env:
         - name: KUBECONFIG
           value: $(workspaces.shared-workspace.path)/kubeconfig
-      image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      image: quay.io/rhn_support_azgabur/alpine/k8s:latest
       imagePullPolicy: IfNotPresent
     - name: uninstall-operators
       args:
-        - uninstall
-        - -n=default
-        - --ignore-not-found
-        - --wait
-        - kuadrant-operators
+        - >-
+          helm uninstall 
+          -n=default 
+          --ignore-not-found 
+          --wait 
+          kuadrant-operators
       command:
-        - helm
+        - /bin/bash
+        - -c
       env:
         - name: KUBECONFIG
           value: $(workspaces.shared-workspace.path)/kubeconfig
-      image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      image: quay.io/rhn_support_azgabur/alpine/k8s:latest
       imagePullPolicy: IfNotPresent
     - name: delete-cert-manager-namespace
       args:
-        - delete
-        - --ignore-not-found
-        - ns
-        - cert-manager
+        - kubectl delete --ignore-not-found ns cert-manager
       command:
-        - kubectl
+        - /bin/bash
+        - -c
       env:
         - name: KUBECONFIG
           value: $(workspaces.shared-workspace.path)/kubeconfig
-      image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      image: quay.io/rhn_support_azgabur/alpine/k8s:latest
       imagePullPolicy: IfNotPresent
     - name: delete-kuadrant-crd
       args:
@@ -54,7 +56,7 @@ spec:
       env:
         - name: KUBECONFIG
           value: $(workspaces.shared-workspace.path)/kubeconfig
-      image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      image: quay.io/rhn_support_azgabur/alpine/k8s:latest
       imagePullPolicy: IfNotPresent
     - name: delete-istio-crd
       args:
@@ -65,7 +67,7 @@ spec:
       env:
         - name: KUBECONFIG
           value: $(workspaces.shared-workspace.path)/kubeconfig
-      image: quay.io/rhn_support_azgabur/alpine/k8s:1.31.2
+      image: quay.io/rhn_support_azgabur/alpine/k8s:latest
       imagePullPolicy: IfNotPresent
   workspaces:
   - name: shared-workspace
diff --git a/tasks/kustomization.yaml b/tasks/kustomization.yaml
@@ -5,7 +5,3 @@ resources:
   - kubectl-login-task.yaml
   - run-tests-task.yaml
   - upload-results-task.yaml
-  - 01-clone.yaml
-  - 02-uninstall.yaml
-  - 03-helm-install-nightly.yaml
-  - 04-helm-install.yaml