major tekton cleanup

* update minimum workflow to allign with new minimum * add tekton typical workflow * update everything workflow to align with new everything * add reporting to finally * move all charts starting with 'ploigos-workflow-' to 'charts/plogigos-workflow/' and remove the prefix to work around helm/chart-testing#343 * update README to reflect local testing updates * update to use 'ref' instead of 'name' for EventListener TriggerTemplate references due to deprivation of 'name' parameter * .github workflows * in testing kind cluster create default IngressClass * upgrade testing to use helm 3.6.1
itewk · Jun 22, 2021 · 9762ee4 · 9762ee4
1 parent 172234c
commit 9762ee4
Show file tree

Hide file tree

Showing 74 changed files with 1,979 additions and 256 deletions.
diff --git a/.github/scripts/configure-kube.sh b/.github/scripts/configure-kube.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+echo "Install ingress controller"
+helm repo add haproxy-ingress https://haproxy-ingress.github.io/charts
+helm install haproxy-ingress haproxy-ingress/haproxy-ingress \
+    --create-namespace --namespace=ingress-controller \
+    --set controller.hostNetwork=true
+kubectl apply -f - <<EOF
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+    name: haproxy
+    annotations:
+    ingressclass.kubernetes.io/is-default-class: 'true'
+spec:
+    controller: haproxy-ingress.github.io/controller
+EOF
+
+echo "Install tekton"
+kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.22.0/release.yaml
+kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/previous/v0.12.1/release.yaml
diff --git a/.github/scripts/lint.sh b/.github/scripts/lint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# NOTE:
+#   --validate-chart-schema=false due to https://github.com/helm/chart-testing/pull/300
+
+ct lint \
+    --chart-dirs charts/ploigos-workflow/ \
+    --all \
+    --validate-maintainers=false
diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ct install \
+  --chart-dirs charts/ploigos-workflow/ \
+  --all
diff --git a/.github/workflows/publish-helm-charts-edge.yml b/.github/workflows/publish-helm-charts-edge.yml
@@ -44,24 +44,18 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Setup Python 🧰🐍
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
 
     - name: Setup chart-testing 🧰
-      uses: helm/chart-testing-action@v2.0.1
+      uses: helm/chart-testing-action@v2.1.0
 
-    # NOTE:
-    #   --validate-chart-schema=false due to https://github.com/helm/chart-testing/pull/300
     - name: Lint with chart-testing 🧪🖋
-      run: |
-        ct lint \
-          --all \
-          --validate-maintainers=false \
-          --validate-chart-schema=false
+      run: ${GITHUB_WORKSPACE}/.github/scripts/lint.sh
 
   install-test:
     runs-on: ubuntu-latest
@@ -76,35 +70,24 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Setup Python 🐍
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
 
     - name: Setup chart-testing 🧰
-      uses: helm/chart-testing-action@v2.0.1
+      uses: helm/chart-testing-action@v2.1.0
 
     - name: Setup kind cluster 🧰
       uses: helm/kind-action@v1.1.0
 
     - name: Configure Kubernetes 🧰
-      run: |
-        echo "Install ingress controller"
-        helm repo add haproxy-ingress https://haproxy-ingress.github.io/charts
-        helm install haproxy-ingress haproxy-ingress/haproxy-ingress \
-          --create-namespace --namespace=ingress-controller \
-          --set controller.hostNetwork=true
-
-        echo "Install tekton"
-        kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.16.3/release.yaml
-        kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/previous/v0.8.1/release.yaml
+      run: ${GITHUB_WORKSPACE}/.github/scripts/configure-kube.sh
 
     - name: Test install with chart-testing 🧪
-      run: |
-        ct install \
-          --all
+      run: ${GITHUB_WORKSPACE}/.github/scripts/test.sh
 
   prepare-for-release:
     runs-on: ubuntu-latest
@@ -258,7 +241,7 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Run chart-releaser 🚀
       uses: helm/chart-releaser-action@v1.1.0

diff --git a/.github/workflows/publish-helm-charts-release.yml b/.github/workflows/publish-helm-charts-release.yml
@@ -68,24 +68,18 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Setup Python 🧰🐍
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
 
     - name: Setup chart-testing 🧰
-      uses: helm/chart-testing-action@v2.0.1
+      uses: helm/chart-testing-action@v2.1.0
 
-    # NOTE:
-    #   --validate-chart-schema=false due to https://github.com/helm/chart-testing/pull/300
     - name: Lint with chart-testing 🧪🖋
-      run: |
-        ct lint \
-          --all \
-          --validate-maintainers=false \
-          --validate-chart-schema=false
+      run: ${GITHUB_WORKSPACE}/.github/scripts/lint.sh
 
   install-test:
     runs-on: ubuntu-latest
@@ -100,35 +94,24 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Setup Python 🐍
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
 
     - name: Setup chart-testing 🧰
-      uses: helm/chart-testing-action@v2.0.1
+      uses: helm/chart-testing-action@v2.1.0
 
     - name: Setup kind cluster 🧰
       uses: helm/kind-action@v1.1.0
 
     - name: Configure Kubernetes 🧰
-      run: |
-        echo "Install ingress controller"
-        helm repo add haproxy-ingress https://haproxy-ingress.github.io/charts
-        helm install haproxy-ingress haproxy-ingress/haproxy-ingress \
-          --create-namespace --namespace=ingress-controller \
-          --set controller.hostNetwork=true
-
-        echo "Install tekton"
-        kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.16.3/release.yaml
-        kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/previous/v0.8.1/release.yaml
+      run: ${GITHUB_WORKSPACE}/.github/scripts/configure-kube.sh
 
     - name: Test install with chart-testing 🧪
-      run: |
-        ct install \
-          --all
+      run: ${GITHUB_WORKSPACE}/.github/scripts/test.sh
 
   prepare-for-release:
     runs-on: ubuntu-latest
@@ -201,7 +184,7 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Run chart-releaser 🚀
       uses: helm/chart-releaser-action@v1.1.0

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -23,24 +23,18 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Setup Python 🧰🐍
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
 
     - name: Setup chart-testing 🧰
-      uses: helm/chart-testing-action@v2.0.1
+      uses: helm/chart-testing-action@v2.1.0
 
-    # NOTE:
-    #   --validate-chart-schema=false due to https://github.com/helm/chart-testing/pull/300
     - name: Lint with chart-testing 🧪🖋
-      run: |
-        ct lint \
-          --all \
-          --validate-maintainers=false \
-          --validate-chart-schema=false
+      run: ${GITHUB_WORKSPACE}/.github/scripts/lint.sh
 
   install-test:
     runs-on: ubuntu-latest
@@ -53,32 +47,21 @@ jobs:
     - name: Setup Helm 🧰
       uses: azure/setup-helm@v1
       with:
-        version: v3.4.1
+        version: v3.6.1
 
     - name: Setup Python 🐍
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
 
     - name: Setup chart-testing 🧰
-      uses: helm/chart-testing-action@v2.0.1
+      uses: helm/chart-testing-action@v2.1.0
 
     - name: Setup kind cluster 🧰
       uses: helm/kind-action@v1.1.0
 
     - name: Configure Kubernetes 🧰
-      run: |
-        echo "Install ingress controller"
-        helm repo add haproxy-ingress https://haproxy-ingress.github.io/charts
-        helm install haproxy-ingress haproxy-ingress/haproxy-ingress \
-          --create-namespace --namespace=ingress-controller \
-          --set controller.hostNetwork=true
-
-        echo "Install tekton"
-        kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.16.3/release.yaml
-        kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/previous/v0.8.1/release.yaml
+      run: ${GITHUB_WORKSPACE}/.github/scripts/configure-kube.sh
 
     - name: Test install with chart-testing 🧪
-      run: |
-        ct install \
-          --all
+      run: ${GITHUB_WORKSPACE}/.github/scripts/test.sh
diff --git a/README.md b/README.md
@@ -45,18 +45,28 @@ If you want to use a local [Kind](https://kind.sigs.k8s.io/) cluster to do your
 how you can set it up.
 
 ```bash
-kind create cluster ploigos-test
+kind create cluster --name ploigos-test
 kubectl config use-context kind-ploigos-test
 
 echo "Install ingress controller"
 helm repo add haproxy-ingress https://haproxy-ingress.github.io/charts
-helm install haproxy-ingress haproxy-ingress/haproxy-ingress \
+helm upgrade --install haproxy-ingress haproxy-ingress/haproxy-ingress \
     --create-namespace --namespace=ingress-controller \
     --set controller.hostNetwork=true
+kubectl apply -f - <<EOF
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  name: haproxy
+  annotations:
+    ingressclass.kubernetes.io/is-default-class: 'true'
+spec:
+  controller: haproxy-ingress.github.io/controller
+EOF
 
 echo "Install tekton"
-kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.16.3/release.yaml
-kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/previous/v0.8.1/release.yaml
+kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.22.0/release.yaml
+kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/previous/v0.12.0/release.yaml
 ```
 
 ### Run linter
@@ -74,7 +84,7 @@ ct lint \
 so be aware of what that means.
 
 ```bash
-kubectl config use-context ???
+kubectl config use-context kind-ploigos-test
 
 ct install \
     --all

diff --git a/.../ploigos-workflow-minimal-tekton-pipeline/charts/ploigos-workflow-tekton-shared-resources b/.../ploigos-workflow-minimal-tekton-pipeline/charts/ploigos-workflow-tekton-shared-resources
diff --git a/...ploigos-workflow-standard-tekton-pipeline/charts/ploigos-workflow-tekton-shared-resources b/...ploigos-workflow-standard-tekton-pipeline/charts/ploigos-workflow-tekton-shared-resources
diff --git a/charts/ploigos-workflow-tekton-shared-resources/charts/ploigos-workflow-shared-resources b/charts/ploigos-workflow-tekton-shared-resources/charts/ploigos-workflow-shared-resources
diff --git a/charts/ploigos-workflow/README.md b/charts/ploigos-workflow/README.md
@@ -0,0 +1,15 @@
+# NOTE on mismatched chart name and folder names
+
+## Issue
+The chart names and folder names do not match.
+
+## Reason
+Had to put this in a sub folder (`ploigos-workflow`) and remove `ploigos-workflow-` from the
+folder names of all of these charts due to how `chart-tester` works and helm and kubernetes
+name lengths.
+
+This was first encountered when adding `ploigos-workflow-everything-tekton-pipeline` which
+put us over the character limit.
+
+## Resolution
+Can't be changed until there is some resolution to https://github.com/helm/chart-testing/issues/343.
diff --git a/...kflow-minimal-tekton-pipeline/.helmignore → ...ow/everything-tekton-pipeline/.helmignore b/...kflow-minimal-tekton-pipeline/.helmignore → ...ow/everything-tekton-pipeline/.helmignore
diff --git a/charts/ploigos-workflow/everything-tekton-pipeline/Chart.yaml b/charts/ploigos-workflow/everything-tekton-pipeline/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v2
+name: ploigos-workflow-everything-tekton-pipeline
+description: |
+  A Helm chart for Kubernetes to install the Ploigos Workflow (Everything) run by Tekton for a
+  given application service.
+type: application
+maintainers:
+  - name: Red Hat, Inc.
+    email: ploigos@redhat.com
+dependencies:
+  - name: ploigos-workflow-tekton-shared-resources
+    version: ">= 0.0.0 || >= 0.0.0-0"
+# MANAGED BY: GitHub workflow
+version: 0.16.2
diff --git a/...oigos-workflow/everything-tekton-pipeline/charts/ploigos-workflow-tekton-shared-resources b/...oigos-workflow/everything-tekton-pipeline/charts/ploigos-workflow-tekton-shared-resources
@@ -0,0 +1 @@
+../../tekton-shared-resources
diff --git a/...ndard-tekton-pipeline/ci/test-values.yaml → ...thing-tekton-pipeline/ci/test-values.yaml b/...ndard-tekton-pipeline/ci/test-values.yaml → ...thing-tekton-pipeline/ci/test-values.yaml
@@ -6,11 +6,11 @@ global:
   stepRunnerConfigDir: cicd/step-runner-config
 
   workflowWorkerImageDefault: quay.io/ploigos/ploigos-base:latest
-  workflowWorkerImageUnitTest: quay.io/ploigos/ploigos-tool-maven:nightly
-  workflowWorkerImagePackage: quay.io/ploigos/ploigos-tool-maven:nightly
-  workflowWorkerImageStaticCodeAnalysis: quay.io/ploigos/ploigos-tool-sonar:nightly
-  workflowWorkerImagePushArtifacts: quay.io/ploigos/ploigos-tool-maven:nightly
-  workflowWorkerImageUAT: quay.io/ploigos/ploigos-tool-maven:nightly
+  workflowWorkerImageUnitTest: quay.io/ploigos/ploigos-tool-maven:latest
+  workflowWorkerImagePackage: quay.io/ploigos/ploigos-tool-maven:latest
+  workflowWorkerImageStaticCodeAnalysis: quay.io/ploigos/ploigos-tool-sonar:latest
+  workflowWorkerImagePushArtifacts: quay.io/ploigos/ploigos-tool-maven:latest
+  workflowWorkerImageUAT: quay.io/ploigos/ploigos-tool-maven:latest
 
   # NOTE:
   #   have to test with ingress since GitHub action tests on 'kind' server where routes don't

diff --git a/...ndard-tekton-pipeline/templates/NOTES.txt → ...thing-tekton-pipeline/templates/NOTES.txt b/...ndard-tekton-pipeline/templates/NOTES.txt → ...thing-tekton-pipeline/templates/NOTES.txt