fix: argocd out of sync

linode · Jun 21, 2024 · eb18d7c · eb18d7c
1 parent e9635fa
commit eb18d7c
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 8 deletions.
diff --git a/charts/gitea/templates/gitea/statefulset.yaml b/charts/gitea/templates/gitea/statefulset.yaml
@@ -319,7 +319,9 @@ spec:
           emptyDir: {}
   {{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
       {{- with .Values.persistence.annotations }}
         annotations:

diff --git a/charts/harbor/templates/redis/statefulset.yaml b/charts/harbor/templates/redis/statefulset.yaml
@@ -85,7 +85,9 @@ spec:
     {{- end }}
   {{- if and .Values.persistence.enabled (not $redis.existingClaim) }}
   volumeClaimTemplates:
-  - metadata:
+  - apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
       name: data
       labels:
 {{ include "harbor.labels" . | indent 8 }}

diff --git a/charts/harbor/templates/trivy/trivy-sts.yaml b/charts/harbor/templates/trivy/trivy-sts.yaml
@@ -182,7 +182,9 @@ spec:
     {{- end }}
 {{- if and .Values.persistence.enabled (not $trivy.existingClaim) }}
   volumeClaimTemplates:
-  - metadata:
+  - apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
       name: data
       labels:
 {{ include "harbor.labels" . | indent 8 }}

diff --git a/charts/oauth2-proxy/charts/redis/templates/master/application.yaml b/charts/oauth2-proxy/charts/redis/templates/master/application.yaml
@@ -496,7 +496,9 @@ spec:
             claimName: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }}
   {{- else }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: redis-data
         labels: {{- include "common.labels.matchLabels" . | nindent 10 }}
           app.kubernetes.io/component: master

diff --git a/charts/oauth2-proxy/charts/redis/templates/replicas/statefulset.yaml b/charts/oauth2-proxy/charts/redis/templates/replicas/statefulset.yaml
@@ -493,7 +493,9 @@ spec:
             claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }}
   {{- else }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: redis-data
         labels: {{- include "common.labels.matchLabels" . | nindent 10 }}
           app.kubernetes.io/component: replica

diff --git a/charts/oauth2-proxy/charts/redis/templates/sentinel/statefulset.yaml b/charts/oauth2-proxy/charts/redis/templates/sentinel/statefulset.yaml
@@ -736,7 +736,9 @@ spec:
             claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }}
   {{- else }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: redis-data
         labels: {{- include "common.labels.matchLabels" . | nindent 10 }}
           app.kubernetes.io/component: node

diff --git a/charts/tempo/templates/lib/service-monitor.tpl b/charts/tempo/templates/lib/service-monitor.tpl
@@ -47,7 +47,8 @@ spec:
       scrapeTimeout: {{ . }}
       {{- end }}
       relabelings:
-        - sourceLabels: [job]
+        - action: replace
+          sourceLabels: [job]
           replacement: "{{ $.ctx.Release.Namespace }}/{{ $.component }}"
           targetLabel: job
         {{- if kindIs "string" .clusterLabel }}

diff --git a/values/argocd/argocd.gotmpl b/values/argocd/argocd.gotmpl
@@ -111,6 +111,14 @@ configs:
     users.anonymous.enabled: "false"
     # Note that the clientSecret is not actually used
     # as for now oauth2-proxy handles the login
+    resource.exclusions: |
+        - apiGroups:
+          - "*"
+          kinds:
+          - "PipelineRun"
+          - "TaskRun"
+          clusters:
+          - "*"
     oidc.config: |
       name: Otomi
       issuer: {{ $v._derived.oidcBaseUrl }}

diff --git a/values/jaeger-operator/jaeger-operator.gotmpl b/values/jaeger-operator/jaeger-operator.gotmpl
@@ -59,7 +59,7 @@ jaeger:
     securityContext:
       runAsNonRoot: true
       runAsUser: 1000
-    strategy: allInOne
+    strategy: allinone
 
 rbac:
   clusterRole: true