feat: add deployment node tolerations

cdfoundation · Jul 17, 2023 · 13ad476 · 13ad476
1 parent 51e6784
commit 13ad476
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 19 deletions.
diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml
@@ -0,0 +1,35 @@
+name: Increment Version
+
+on: [pull_request, pull_request_target]
+
+jobs:
+  build:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: check source code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.ACCESS_TOKEN }}
+
+
+      - name: next release version
+        id: nextversion
+        uses: jenkins-x-plugins/jx-release-version@v2.6.11
+        with:
+          previous-version: from-file:charts/tekton-pipeline/Chart.yaml
+
+      - name: Update version in Chart.yaml
+        id: updatechart
+        uses: mikefarah/yq@v4.34.1
+        with:
+          cmd: yq eval '.version = "${{ steps.nextversion.outputs.version }}"' -i charts/tekton-pipeline/Chart.yaml
+
+      - name: Commit Changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'chore: update Chart.yaml'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,24 +11,7 @@ jobs:
     steps:
       - name: check source code
         uses: actions/checkout@v3
-
-      - name: next release version
-        id: nextversion
-        uses: jenkins-x-plugins/jx-release-version@v2.6.11
-        with:
-          previous-version: from-file:charts/tekton-pipeline/Chart.yaml
-
-      - name: Update version in Chart.yaml
-        id: updatechart
-        uses: mikefarah/yq@v4.34.1
-        with:
-          cmd: yq eval '.version = "${{ steps.nextversion.outputs.version }}"' -i charts/tekton-pipeline/Chart.yaml
-
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: 'chore: update Chart.yaml'
-
+
       - uses: J12934/helm-gh-pages-action@master
         with:
           access-token: ${{ secrets.ACCESS_TOKEN }}

diff --git a/charts/tekton-pipeline/Chart.yaml b/charts/tekton-pipeline/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Tekton Pipelines
 name: tekton-pipeline
-version: 0.6.4
+version: 1.0.0
 appVersion: 0.42.0
 icon: https://avatars2.githubusercontent.com/u/47602533
 home: https://github.com/cdfoundation/tekton-helm-chart
diff --git a/charts/tekton-pipeline/patches/tekton-pipelines-controller-deploy.yaml b/charts/tekton-pipeline/patches/tekton-pipelines-controller-deploy.yaml
@@ -22,6 +22,19 @@ spec:
             {{- toYaml . | nindent 8 }}
           {{- end}}
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            -  helmTemplateRemoveMe: |
+                {{- with .Values.controllerDeploymentTolerations.nodeSelectorTerms }}
+                  {{- toYaml . |  nindent 12 }}
+                {{- end}}
+            - matchExpressions:
+              - key: kubernetes.io/os
+                operator: NotIn
+                values:
+                  - windows
       containers:
       - name: tekton-pipelines-controller
         envFrom:
@@ -30,3 +43,13 @@ spec:
             optional: true
       helmTemplateRemoveMe: |
         image: {{ .Values.controller.deployment.image }}
+      nodeSelector:
+        helmTemplateRemoveMe: |
+          {{- with .Values.controllerDeploymentTolerations.nodeSelector }}
+            {{- toYaml . |  nindent 8 }}
+          {{- end}}
+      tolerations:
+        - helmTemplateRemoveMe: |
+            {{- with .Values.controllerDeploymentTolerations.tolerations }}
+              {{- toYaml . |  nindent 6 }}
+            {{- end}}
diff --git a/charts/tekton-pipeline/patches/tekton-pipelines-webhook-deploy.yaml b/charts/tekton-pipeline/patches/tekton-pipelines-webhook-deploy.yaml
@@ -22,3 +22,13 @@ spec:
         - secretRef:
             name: "{{ .Values.webhook.envFromSecret }}"
             optional: true
+      nodeSelector:
+        helmTemplateRemoveMe: |
+          {{- with .Values.webhookDeploymentTolerations.nodeSelector }}
+            {{- toYaml . |  nindent 8 }}
+          {{- end}}
+      tolerations:
+        - helmTemplateRemoveMe: |
+            {{- with .Values.webhookDeploymentTolerations.tolerations }}
+              {{- toYaml . |  nindent 6 }}
+            {{- end}}
diff --git a/charts/tekton-pipeline/templates/tekton-pipelines-controller-deploy.yaml b/charts/tekton-pipeline/templates/tekton-pipelines-controller-deploy.yaml
@@ -45,6 +45,9 @@ spec:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
+                {{- with .Values.controllerDeploymentTolerations.nodeSelectorTerms }}
+                  {{- toYaml . |  nindent 12 }}
+                {{- end}}
             - matchExpressions:
               - key: kubernetes.io/os
                 operator: NotIn
@@ -147,7 +150,15 @@ spec:
           name: verification-secrets
           readOnly: true
         image: {{ .Values.controller.deployment.image }}
+      nodeSelector:
+          {{- with .Values.controllerDeploymentTolerations.nodeSelector }}
+            {{- toYaml . |  nindent 8 }}
+          {{- end}}
       serviceAccountName: tekton-pipelines-controller
+      tolerations:
+          {{- with .Values.controllerDeploymentTolerations.tolerations }}
+            {{- toYaml . |  nindent 6 }}
+          {{- end}}
       volumes:
       - configMap:
           name: config-logging

diff --git a/charts/tekton-pipeline/templates/tekton-pipelines-remote-resolvers-deploy.yaml b/charts/tekton-pipeline/templates/tekton-pipelines-remote-resolvers-deploy.yaml
@@ -59,7 +59,16 @@ spec:
                     app.kubernetes.io/part-of: tekton-pipelines
                 topologyKey: kubernetes.io/hostname
               weight: 100
+        {{- with .Values.resolverDeploymentTolerations.nodeAffinity }}
+        nodeAffinity: {{- toYaml . | trim | nindent 10 }}
+        {{- end }}
+      {{- with .Values.resolverDeploymentTolerations.nodeSelector }}
+      nodeSelector: {{- toYaml . | trim | nindent 10 }}
+      {{- end }}
       serviceAccountName: tekton-pipelines-resolvers
+      {{- with .Values.resolverDeploymentTolerations.tolerations }}
+      tolerations: {{- toYaml . | trim | nindent 6 }}
+      {{- end }}
       containers:
         - name: controller
           image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/resolvers:v0.42.0@sha256:eaa7d21d45f0bc1c411823d6a943e668c820f9cf52f1549d188edb89e992f6e0

diff --git a/charts/tekton-pipeline/templates/tekton-pipelines-webhook-deploy.yaml b/charts/tekton-pipeline/templates/tekton-pipelines-webhook-deploy.yaml
@@ -125,4 +125,12 @@ spec:
           runAsUser: 65532
           seccompProfile:
             type: RuntimeDefault
+      nodeSelector:
+          {{- with .Values.webhookDeploymentTolerations.nodeSelector }}
+            {{- toYaml . |  nindent 8 }}
+          {{- end}}
       serviceAccountName: tekton-pipelines-webhook
+      tolerations:
+          {{- with .Values.webhookDeploymentTolerations.tolerations }}
+            {{- toYaml . |  nindent 6 }}
+          {{- end}}
diff --git a/charts/tekton-pipeline/values.yaml b/charts/tekton-pipeline/values.yaml
@@ -94,6 +94,21 @@ remoteResolversPod:
     requests:
       cpu: 100m
       memory: 100Mi
+# Add node affinity tolerations for tekton-remote-resolvers
+resolverDeploymentTolerations:
+  nodeAffinity: []
+  nodeSelector: []
+  tolerations: []
+# Add node affinity tolerations for tekton-pipeline-controller
+controllerDeploymentTolerations:
+  nodeSelectorTerms: []
+  nodeSelector: []
+  tolerations: []
+# Add node affinity tolerations for tekton-pipelines-webhook
+webhookDeploymentTolerations:
+  nodeSelectorTerms: []
+  nodeSelector: []
+  tolerations: []
 gitResolverConfig:
   # The maximum amount of time a single anonymous cloning resolution may take.
   fetch-timeout: "1m"

diff --git a/src/templates/tekton-pipelines-remote-resolvers-deploy.yaml b/src/templates/tekton-pipelines-remote-resolvers-deploy.yaml
@@ -59,7 +59,16 @@ spec:
                     app.kubernetes.io/part-of: tekton-pipelines
                 topologyKey: kubernetes.io/hostname
               weight: 100
+        {{- with .Values.resolverDeploymentTolerations.nodeAffinity }}
+        nodeAffinity: {{- toYaml . | trim | nindent 10 }}
+        {{- end }}
+      {{- with .Values.resolverDeploymentTolerations.nodeSelector }}
+      nodeSelector: {{- toYaml . | trim | nindent 10 }}
+      {{- end }}
       serviceAccountName: tekton-pipelines-resolvers
+      {{- with .Values.resolverDeploymentTolerations.tolerations }}
+      tolerations: {{- toYaml . | trim | nindent 6 }}
+      {{- end }}
       containers:
         - name: controller
           image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/resolvers:v0.42.0@sha256:eaa7d21d45f0bc1c411823d6a943e668c820f9cf52f1549d188edb89e992f6e0