Skip to content

Commit c900e50

Browse files
authored
Migrate ExternalSecrets to v1 API - hack/new-cluster templates (redhat-appstudio#10300)
Update new-cluster template files from external-secrets.io/v1beta1 to v1 API version. Files updated: - hack/new-cluster/templates/multi-platform-controller/external-secrets.yaml: 5 ExternalSecrets - hack/new-cluster/templates/pipeline-service/deploy.yaml: 6 ExternalSecrets - hack/new-cluster/templates/backup/kustomization.yaml: 1 patch target - hack/new-cluster/templates/build-service/kustomization.yaml: 1 patch target - hack/new-cluster/templates/cost-management/kustomization.yaml: 1 patch target - hack/new-cluster/templates/integration/kustomization.yaml: 1 patch target - hack/new-cluster/templates/pipeline-service/resources/kustomization.yaml: 5 patch targets Total changes: 11 ExternalSecret apiVersions + 9 kustomization patch target versions These templates are used when creating new clusters and need to match the v1 API used in the main components directory.
1 parent cbdfbc4 commit c900e50

7 files changed

Lines changed: 20 additions & 20 deletions

File tree

hack/new-cluster/templates/backup/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resources:
66
patches:
77
- target:
88
group: external-secrets.io
9-
version: v1beta1
9+
version: v1
1010
kind: ExternalSecret
1111
name: backup-s3-credentials
1212
path: backup-s3-credentials-patch.yaml

hack/new-cluster/templates/build-service/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ patches:
88
target:
99
name: pipelines-as-code-secret
1010
group: external-secrets.io
11-
version: v1beta1
11+
version: v1
1212
kind: ExternalSecret
1313
{% if network == "private" %}
1414

hack/new-cluster/templates/cost-management/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ patches:
88
target:
99
name: costmanagementmetricsconfig
1010
group: costmanagement-metrics-cfg.openshift.io
11-
version: v1beta1
11+
version: v1
1212
kind: CostManagementMetricsConfig

hack/new-cluster/templates/integration/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ patches:
77
target:
88
name: pipelines-as-code-secret
99
group: external-secrets.io
10-
version: v1beta1
10+
version: v1
1111
kind: ExternalSecret
1212
- path: console-url-config-patch.json
1313
target:

hack/new-cluster/templates/multi-platform-controller/external-secrets.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: external-secrets.io/v1beta1
1+
apiVersion: external-secrets.io/v1
22
kind: ExternalSecret
33
metadata:
44
name: aws-ssh-key
@@ -21,7 +21,7 @@ spec:
2121
deletionPolicy: Delete
2222
name: aws-ssh-key
2323
---
24-
apiVersion: external-secrets.io/v1beta1
24+
apiVersion: external-secrets.io/v1
2525
kind: ExternalSecret
2626
metadata:
2727
name: aws-account
@@ -44,7 +44,7 @@ spec:
4444
deletionPolicy: Delete
4545
name: aws-account
4646
---
47-
apiVersion: external-secrets.io/v1beta1
47+
apiVersion: external-secrets.io/v1
4848
kind: ExternalSecret
4949
metadata:
5050
name: ibm-s390x-ssh-key
@@ -67,7 +67,7 @@ spec:
6767
deletionPolicy: Delete
6868
name: ibm-s390x-ssh-key
6969
---
70-
apiVersion: external-secrets.io/v1beta1
70+
apiVersion: external-secrets.io/v1
7171
kind: ExternalSecret
7272
metadata:
7373
name: ibm-api-key
@@ -90,7 +90,7 @@ spec:
9090
deletionPolicy: Delete
9191
name: ibm-api-key
9292
---
93-
apiVersion: external-secrets.io/v1beta1
93+
apiVersion: external-secrets.io/v1
9494
kind: ExternalSecret
9595
metadata:
9696
name: ibm-ppc64le-ssh-key

hack/new-cluster/templates/pipeline-service/deploy.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,7 +2011,7 @@ spec:
20112011
secret:
20122012
secretName: tekton-results-for-watcher-tls
20132013
---
2014-
apiVersion: external-secrets.io/v1beta1
2014+
apiVersion: external-secrets.io/v1
20152015
kind: ExternalSecret
20162016
metadata:
20172017
annotations:
@@ -2032,7 +2032,7 @@ spec:
20322032
deletionPolicy: Delete
20332033
name: pipelines-as-code-secret
20342034
---
2035-
apiVersion: external-secrets.io/v1beta1
2035+
apiVersion: external-secrets.io/v1
20362036
kind: ExternalSecret
20372037
metadata:
20382038
annotations:
@@ -2058,7 +2058,7 @@ spec:
20582058
annotations:
20592059
argocd.argoproj.io/sync-options: Prune=false
20602060
---
2061-
apiVersion: external-secrets.io/v1beta1
2061+
apiVersion: external-secrets.io/v1
20622062
kind: ExternalSecret
20632063
metadata:
20642064
annotations:
@@ -2082,7 +2082,7 @@ spec:
20822082
annotations:
20832083
argocd.argoproj.io/sync-options: Prune=false
20842084
---
2085-
apiVersion: external-secrets.io/v1beta1
2085+
apiVersion: external-secrets.io/v1
20862086
kind: ExternalSecret
20872087
metadata:
20882088
annotations:
@@ -2113,7 +2113,7 @@ spec:
21132113
s3_url: s3://{{ .bucket }}
21142114
{% endraw %}
21152115
---
2116-
apiVersion: external-secrets.io/v1beta1
2116+
apiVersion: external-secrets.io/v1
21172117
kind: ExternalSecret
21182118
metadata:
21192119
annotations:
@@ -2134,7 +2134,7 @@ spec:
21342134
deletionPolicy: Delete
21352135
name: tekton-results-database
21362136
---
2137-
apiVersion: external-secrets.io/v1beta1
2137+
apiVersion: external-secrets.io/v1
21382138
kind: ExternalSecret
21392139
metadata:
21402140
annotations:

hack/new-cluster/templates/pipeline-service/resources/kustomization.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ patches:
88
target:
99
name: tekton-chains-public-key
1010
group: external-secrets.io
11-
version: v1beta1
11+
version: v1
1212
kind: ExternalSecret
1313
- path: tekton-chains-signing-secret-path.yaml
1414
target:
1515
name: tekton-chains-signing-secret
1616
group: external-secrets.io
17-
version: v1beta1
17+
version: v1
1818
kind: ExternalSecret
1919
- path: tekton-results-database-secret-path.yaml
2020
target:
2121
name: tekton-results-database
2222
group: external-secrets.io
23-
version: v1beta1
23+
version: v1
2424
kind: ExternalSecret
2525
- path: tekton-results-s3-secret-path.yaml
2626
target:
2727
name: tekton-results-s3
2828
group: external-secrets.io
29-
version: v1beta1
29+
version: v1
3030
kind: ExternalSecret
3131
- path: pipelines-as-code-secret-path.yaml
3232
target:
3333
name: pipelines-as-code-secret
3434
group: external-secrets.io
35-
version: v1beta1
35+
version: v1
3636
kind: ExternalSecret
3737
- path: update-tekton-config-pac.yaml
3838
target:

0 commit comments

Comments
 (0)