Skip to content

Commit 183c8ce

Browse files
oswcabclaude
andcommitted
Add explicit default fields to all ExternalSecret definitions
Add conversionStrategy, decodingStrategy, and metadataPolicy fields explicitly to all ExternalSecret extract blocks to prevent ArgoCD OutOfSync status. The External Secrets Operator automatically adds these default values to resources even when not specified in Git manifests, causing ArgoCD to detect drift. By explicitly defining these fields with their default values (Default, None, None respectively), we ensure the Git manifest matches the live cluster state and eliminate false OutOfSync alerts. For now, and as an additional verification step, this change is only applied to staging. Co-Authored-By: Claude <[email protected]>
1 parent a502bd0 commit 183c8ce

File tree

47 files changed

+180
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+180
-14
lines changed

components/build-service/base/external-secrets/pipelines-as-code-secret.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ metadata:
88
spec:
99
dataFrom:
1010
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
1113
key: staging/pipeline-service/github-app
14+
metadataPolicy: None
1215
refreshInterval: 5m
1316
secretStoreRef:
1417
kind: ClusterSecretStore

components/build-templates/staging/e2e-quay-push-secret.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ metadata:
99
spec:
1010
dataFrom:
1111
- extract:
12+
conversionStrategy: Default
13+
decodingStrategy: None
1214
key: staging/build/tekton-ci/quay-push-secret
15+
metadataPolicy: None
1316
refreshInterval: 15m
1417
secretStoreRef:
1518
kind: ClusterSecretStore

components/ci-helper-app/staging/external-secrets/ci-helper-app-secrets.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ metadata:
88
spec:
99
dataFrom:
1010
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
1113
key: staging/qe/ci-helper-app-secrets
14+
metadataPolicy: None
1215
refreshInterval: 1h
1316
secretStoreRef:
1417
kind: ClusterSecretStore

components/cluster-as-a-service/staging/external-secrets.yaml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ metadata:
77
hypershift.openshift.io/safe-to-delete-with-cluster: "false"
88
spec:
99
dataFrom:
10-
- extract:
11-
key: staging/eaas/stage-eaas-serviceaccount
12-
- extract:
13-
key: staging/eaas/konflux-eaas-stage
10+
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
13+
key: staging/eaas/stage-eaas-serviceaccount
14+
metadataPolicy: None
15+
- extract:
16+
conversionStrategy: Default
17+
decodingStrategy: None
18+
key: staging/eaas/konflux-eaas-stage
19+
metadataPolicy: None
1420
refreshInterval: 5m
1521
secretStoreRef:
1622
kind: ClusterSecretStore
@@ -28,7 +34,6 @@ spec:
2834
pull-secret: "{{ .ocp_pull_secret }}"
2935
ssh-privatekey: unused
3036
ssh-publickey: unused
31-
3237
---
3338
apiVersion: external-secrets.io/v1beta1
3439
kind: ExternalSecret
@@ -37,8 +42,11 @@ metadata:
3742
namespace: local-cluster
3843
spec:
3944
dataFrom:
40-
- extract:
41-
key: staging/eaas/stage-eaas-bucket-s3
45+
- extract:
46+
conversionStrategy: Default
47+
decodingStrategy: None
48+
key: staging/eaas/stage-eaas-bucket-s3
49+
metadataPolicy: None
4250
refreshInterval: 5m
4351
secretStoreRef:
4452
kind: ClusterSecretStore

components/cost-management/base/external-service-account-secret.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ metadata:
88
spec:
99
dataFrom:
1010
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
1113
key: # will be added by the overlays
14+
metadataPolicy: None
1215
refreshInterval: 1h
1316
secretStoreRef:
1417
kind: ClusterSecretStore

components/crossplane-control-plane/staging/provider-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ spec:
1212
namespace: crossplane-system
1313
name: eaas-cluster
1414
key: kubeconfig
15-
1615
---
1716
apiVersion: external-secrets.io/v1beta1
1817
kind: ExternalSecret
@@ -25,7 +24,10 @@ metadata:
2524
spec:
2625
dataFrom:
2726
- extract:
27+
conversionStrategy: Default
28+
decodingStrategy: None
2829
key: staging/eaas/eaas-stage-kubeconfig
30+
metadataPolicy: None
2931
refreshInterval: 1h
3032
secretStoreRef:
3133
kind: ClusterSecretStore

components/crossplane-control-plane/staging/testplatform-provider-config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ metadata:
2424
spec:
2525
dataFrom:
2626
- extract:
27+
conversionStrategy: Default
28+
decodingStrategy: None
2729
key: production/openshift-ci/appci-cluster
30+
metadataPolicy: None
2831
refreshInterval: 1h
2932
secretStoreRef:
3033
kind: ClusterSecretStore

components/dora-metrics/base/external-secrets/exporters-secrets.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ metadata:
88
spec:
99
dataFrom:
1010
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
1113
key: staging/qe/exporters-secret
14+
metadataPolicy: None
1215
refreshInterval: 1h
1316
secretStoreRef:
1417
kind: ClusterSecretStore

components/has/base/external-secrets/has-github-token.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ metadata:
88
spec:
99
dataFrom:
1010
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
1113
key: staging/has/github-token
14+
metadataPolicy: None
1215
refreshInterval: 1h
1316
secretStoreRef:
1417
kind: ClusterSecretStore

components/image-controller/base/external-secrets/quaytoken.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ metadata:
88
spec:
99
dataFrom:
1010
- extract:
11+
conversionStrategy: Default
12+
decodingStrategy: None
1113
key: staging/build/image-controller
14+
metadataPolicy: None
1215
refreshInterval: 5m
1316
secretStoreRef:
1417
kind: ClusterSecretStore

0 commit comments

Comments
 (0)