Revert "fix: versions (#1749)"

This reverts commit 4ad18c0.
linode · Oct 9, 2024 · 96c4d70 · 96c4d70
1 parent f88fd3b
commit 96c4d70
Show file tree

Hide file tree

Showing 29 changed files with 237 additions and 617 deletions.
diff --git a/charts/team-ns/templates/tekton-tasks/buildpacks.yaml b/charts/team-ns/templates/tekton-tasks/buildpacks.yaml
@@ -1,5 +1,3 @@
-{{- $v := .Values }}
-{{- range $v.resources }}
 apiVersion: tekton.dev/v1
 kind: Task
 metadata:
@@ -87,7 +85,13 @@ spec:
     env:
       - name: CNB_PLATFORM_API
         value: "0.9"
-    computeResources: {{- $v.resources.buildpacksTask | toYaml | nindent 6 }}
+    computeResources:
+      limits:
+        cpu: "2"
+        memory: 2Gi
+      requests:
+        cpu: 500m
+        memory: 512Mi
   steps:
     - name: prepare
       computeResources: {}
@@ -197,5 +201,4 @@ spec:
     - name: empty-dir
       emptyDir: {}
     - name: layers-dir
-      emptyDir: {}
-{{- end }}
+      emptyDir: {}
diff --git a/charts/team-ns/templates/tekton-tasks/git-clone.yaml b/charts/team-ns/templates/tekton-tasks/git-clone.yaml
@@ -1,5 +1,3 @@
-{{- $v := .Values }}
-{{- range $v.resources }}
 apiVersion: tekton.dev/v1
 kind: Task
 metadata:
@@ -14,7 +12,13 @@ metadata:
     tekton.dev/platforms: "linux/amd64,linux/s390x,linux/ppc64le,linux/arm64"
 spec:
   stepTemplate:
-    computeResources: {{- $v.resources.gitcloneTask | toYaml | nindent 6 }}
+    computeResources:
+      limits:
+        cpu: "2"
+        memory: 2Gi
+      requests:
+        cpu: 500m
+        memory: 512Mi
   description: >-
     These Tasks are Git tasks to work with repositories used by other tasks
     in your Pipeline.
@@ -255,5 +259,4 @@ spec:
         RESULT_COMMITTER_DATE="$(git log -1 --pretty=%ct)"
         printf "%s" "${RESULT_COMMITTER_DATE}" > "$(results.committer-date.path)"
         printf "%s" "${RESULT_SHA}" > "$(results.commit.path)"
-        printf "%s" "${PARAM_URL}" > "$(results.url.path)"
-{{- end }}
+        printf "%s" "${PARAM_URL}" > "$(results.url.path)"
diff --git a/charts/team-ns/templates/tekton-tasks/grype.yaml b/charts/team-ns/templates/tekton-tasks/grype.yaml
@@ -1,5 +1,3 @@
-{{- $v := .Values }}
-{{- range $v.resources }}
 apiVersion: tekton.dev/v1
 kind: Task
 metadata:
@@ -14,7 +12,13 @@ metadata:
     tekton.dev/platforms: "linux/amd64,linux/arm64,linux/ppc64le,linux/390x"
 spec:
   stepTemplate:
-    computeResources: {{- $v.resources.grypeTask | toYaml | nindent 6 }}
+    computeResources:
+      limits:
+        cpu: "2"
+        memory: 2Gi
+      requests:
+        cpu: 500m
+        memory: 512Mi
   description: >-
     A vulnerability scanner for container images and filesystems.
     Works with Syft, the powerful SBOM (software bill of materials) tool for container images and filesystems.
@@ -43,4 +47,3 @@ spec:
             - "ALL"
         seccompProfile:
           type: RuntimeDefault
-{{- end }}
diff --git a/charts/team-ns/templates/tekton-tasks/kaniko.yaml b/charts/team-ns/templates/tekton-tasks/kaniko.yaml
@@ -1,5 +1,3 @@
-{{- $v := .Values }}
-{{- range $v.resources }}
 apiVersion: tekton.dev/v1
 kind: Task
 metadata:
@@ -14,7 +12,13 @@ metadata:
     tekton.dev/platforms: "linux/amd64,linux/arm64,linux/ppc64le"
 spec:
   stepTemplate:
-    computeResources: {{- $v.resources.kanikoTask | toYaml | nindent 6 }}
+    computeResources:
+      limits:
+        cpu: "2"
+        memory: 2Gi
+      requests:
+        cpu: 500m
+        memory: 512Mi
   description: >-
     This Task builds a simple Dockerfile with kaniko and pushes to a registry.
     This Task stores the image name and digest as results, allowing Tekton Chains to pick up
@@ -76,4 +80,3 @@ spec:
         set -e
         image="$(params.IMAGE)"
         echo -n "${image}" | tee "$(results.IMAGE_URL.path)"
-{{- end }}
diff --git a/charts/tekton-pipelines/templates/deployment-tekton-events-controller.yaml b/charts/tekton-pipelines/templates/deployment-tekton-events-controller.yaml
@@ -63,7 +63,13 @@ spec:
         - name: tekton-events-controller
           image: {{ .Values.events.deployment.image }}
           args: []
-          resources: {{- toYaml .Values.events.resources | nindent 12 }}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: 1000m
+              memory: 1000Mi
           volumeMounts:
             - name: config-logging
               mountPath: /etc/config-logging

diff --git a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-controller.yaml b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-controller.yaml
@@ -122,7 +122,13 @@ spec:
             runAsNonRoot: true
             seccompProfile:
               type: RuntimeDefault
-          resources: {{- toYaml .Values.controller.resources | nindent 12 }}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: 1000m
+              memory: 1000Mi
           ports:
             - name: metrics
               containerPort: 9090

diff --git a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-remote-resolvers.yaml b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-remote-resolvers.yaml
@@ -64,7 +64,13 @@ spec:
       containers:
         - name: controller
           image: {{ .Values.remoteresolver.deployment.image }}
-          resources: {{- toYaml .Values.controller.resources | nindent 12 }}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: 1000m
+              memory: 2Gi
           ports:
             - name: metrics
               containerPort: 9090

diff --git a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-webhook.yaml b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-webhook.yaml
@@ -78,7 +78,13 @@ spec:
           # and substituted here.
           image: {{ .Values.webhook.deployment.image }}
           # Resource request required for autoscaler to take any action for a metric
-          resources: {{- toYaml .Values.events.resources | nindent 12 }}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: 500m
+              memory: 500Mi
           env:
             - name: SYSTEM_NAMESPACE
               valueFrom:

diff --git a/charts/tekton-pipelines/values.yaml b/charts/tekton-pipelines/values.yaml
@@ -20,7 +20,13 @@ controller:
                   - windows
   tolerations: []
   nodeSelector: {}
-  resources: {}
+  resources:
+    requests:
+      cpu: 100m
+      memory: 100Mi
+    limits:
+      cpu: 1000m
+      memory: 1000Mi
 # Values for tekton-pipelines-webhook
 webhook:
   deployment:
@@ -42,17 +48,21 @@ webhook:
                   - windows
   tolerations: []
   nodeSelector: {}
-  resources: {}
 # Values to amend tekton-pipelines-remote-resolvers
 remoteresolver:
   deployment:
     image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/resolvers:v0.53.0@sha256:6445641a3ea1afa918f92ef51d18edf1bdb40c08878374db33e290221e3564e1
   affinity: {}
   tolerations: []
   nodeSelector: {}
-  resources: {}
+  resources:
+    requests:
+      cpu: 100m
+      memory: 100Mi
+    limits:
+      cpu: 1000m
+      memory: 1000Mi
 
 events:
   deployment:
-    image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/events:v0.53.0@sha256:340e1edd0783bdb86e396ef53499f068a42da1986a1d806ab652b448869637bd
-  resources: {}
+    image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/events:v0.53.0@sha256:340e1edd0783bdb86e396ef53499f068a42da1986a1d806ab652b448869637bd
diff --git a/core.yaml b/core.yaml
@@ -3,7 +3,6 @@ k8s:
   namespaces:
     - name: argocd
       app: argocd
-      disableIstioInjection: true
     - name: cert-manager
       disableIstioInjection: true
     - name: cnpg-system
@@ -110,7 +109,6 @@ k8s:
     - name: velero
       app: velero
       disablePolicyChecks: true
-      disableIstioInjection: true
     - name: otomi-pipelines
       app: tekton
       disableIstioInjection: true

diff --git a/helmfile.d/helmfile-60.teams.yaml b/helmfile.d/helmfile-60.teams.yaml
@@ -39,7 +39,6 @@ releases:
       pipeline: otomi-task-teams
     values:
       - ../values/tekton-dashboard/tekton-dashboard-teams.gotmpl
-      - resources: {{- $team.resources.tektonDashboard | toYaml | nindent 10 }}
   - name: prometheus-{{ $teamId }}
     installed: {{ or ($team | get "managedMonitoring.grafana" false) ($team | get "managedMonitoring.alertmanager" false) }}
     namespace: team-{{ $teamId }}
@@ -58,7 +57,6 @@ releases:
           namespaceOverride: null
           alertmanagerSpec:
             externalUrl: "https://alertmanager-{{ $teamId }}.{{ $domain }}"
-            resources: {{- $team.resources.alertmanager | toYaml | nindent 14 }}
             podMetadata:
               annotations:
                 sidecar.istio.io/inject: "true"
@@ -79,14 +77,12 @@ releases:
           namespaceOverride: null # team-{{ $teamId }}
           nameOverride: {{ $teamId }}-po-grafana
           fullnameOverride: {{ $teamId }}-po-grafana
-          resources: {{- $team.resources.grafana | toYaml | nindent 12 }}
           grafana.ini:
             "auth.generic_oauth":
               role_attribute_path: contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'team-admin') && 'Admin' || contains(groups[*], 'team-{{ $teamId }}') && 'Editor'{{ if not ($team | get "managedMonitoring.private" false) }} || 'Viewer'{{- end }}
             server:
               root_url: https://grafana-{{ $teamId }}.{{ $domain }}
           sidecar:
-            resources: {{- $team.resources.grafanaSidecar | toYaml | nindent 14 }}
             datasources:
               defaultDatasourceEnabled: false
             dashboards: