Skip to content

Commit f28215f

Browse files
ESO-168:Upstream bump for v0.18.x and rebase for v1.0.0 release (#51)
* Bump dependencies with upstream external secrets new version changes in go mod and vendor * Adds replace github.com/external-secrets/external-secrets => github.com/openshift/external-secrets * Update Makefile & manager.yaml - replace BUNDLE_VERSION - replace EXTERNAL_SECRETS_VERSION - updated skip_range in manager.yaml - * make update - * make bundle - * make update-bindata * update builder image to Go 1.24 for OCP 4.20 * Changes * Changes * Changes in the API versions * Changes in the rbac for the operand * Changes the api version in samples
1 parent a231aac commit f28215f

File tree

2,153 files changed

+165971
-102094
lines changed

Some content is hidden

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

2,153 files changed

+165971
-102094
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: builder
33
namespace: ocp
4-
tag: rhel-9-golang-1.23-openshift-4.19
4+
tag: rhel-9-golang-1.24-openshift-4.20

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the external-secrets-operator binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 0.1.0
6+
VERSION ?= 1.0.0
77

88
# EXTERNAL_SECRETS_VERSION defines the external-secrets release version to fetch helm charts.
9-
EXTERNAL_SECRETS_VERSION ?= v0.14.3
9+
EXTERNAL_SECRETS_VERSION ?= v0.19.0
1010

1111
# CHANNELS define the bundle channels used in the bundle.
1212
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -202,7 +202,7 @@ endif
202202

203203
.PHONY: install
204204
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
205-
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
205+
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply --server-side -f -
206206

207207
.PHONY: uninstall
208208
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -211,7 +211,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
211211
.PHONY: deploy
212212
deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
213213
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
214-
$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
214+
$(KUSTOMIZE) build config/default | $(KUBECTL) apply --server-side -f -
215215

216216
.PHONY: undeploy
217217
undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.

bindata/external-secrets/certificate_bitwarden-tls-certs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app.kubernetes.io/name: bitwarden-tls-certs
88
app.kubernetes.io/instance: external-secrets
9-
app.kubernetes.io/version: "v0.14.0"
9+
app.kubernetes.io/version: "v0.19.0"
1010
app.kubernetes.io/managed-by: external-secrets-operator
1111
spec:
1212
secretName: bitwarden-tls-certs

bindata/external-secrets/resources/certificate_external-secrets-webhook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app.kubernetes.io/name: external-secrets-webhook
99
app.kubernetes.io/instance: external-secrets
10-
app.kubernetes.io/version: "v0.14.3"
10+
app.kubernetes.io/version: "v0.19.0"
1111
app.kubernetes.io/managed-by: external-secrets-operator
1212
external-secrets.io/component: webhook
1313
spec:

bindata/external-secrets/resources/clusterrole_external-secrets-cert-controller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app.kubernetes.io/name: external-secrets-cert-controller
88
app.kubernetes.io/instance: external-secrets
9-
app.kubernetes.io/version: "v0.14.3"
9+
app.kubernetes.io/version: "v0.19.0"
1010
app.kubernetes.io/managed-by: external-secrets-operator
1111
rules:
1212
- apiGroups:

bindata/external-secrets/resources/clusterrole_external-secrets-controller.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app.kubernetes.io/name: external-secrets
88
app.kubernetes.io/instance: external-secrets
9-
app.kubernetes.io/version: "v0.14.3"
9+
app.kubernetes.io/version: "v0.19.0"
1010
app.kubernetes.io/managed-by: external-secrets-operator
1111
rules:
1212
- apiGroups:
@@ -17,6 +17,7 @@ rules:
1717
- "externalsecrets"
1818
- "clusterexternalsecrets"
1919
- "pushsecrets"
20+
- "clusterpushsecrets"
2021
verbs:
2122
- "get"
2223
- "list"
@@ -39,6 +40,9 @@ rules:
3940
- "pushsecrets"
4041
- "pushsecrets/status"
4142
- "pushsecrets/finalizers"
43+
- "clusterpushsecrets"
44+
- "clusterpushsecrets/status"
45+
- "clusterpushsecrets/finalizers"
4246
verbs:
4347
- "get"
4448
- "update"
@@ -67,11 +71,13 @@ rules:
6771
- "githubaccesstokens"
6872
- "quayaccesstokens"
6973
- "passwords"
74+
- "sshkeys"
7075
- "stssessiontokens"
7176
- "uuids"
7277
- "vaultdynamicsecrets"
7378
- "webhooks"
7479
- "grafanas"
80+
- "mfas"
7581
verbs:
7682
- "get"
7783
- "list"
@@ -126,3 +132,11 @@ rules:
126132
- "create"
127133
- "update"
128134
- "delete"
135+
- apiGroups:
136+
- "external-secrets.io"
137+
resources:
138+
- "pushsecrets"
139+
verbs:
140+
- "create"
141+
- "update"
142+
- "delete"

bindata/external-secrets/resources/clusterrole_external-secrets-edit.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app.kubernetes.io/name: external-secrets
88
app.kubernetes.io/instance: external-secrets
9-
app.kubernetes.io/version: "v0.14.3"
9+
app.kubernetes.io/version: "v0.19.0"
1010
app.kubernetes.io/managed-by: external-secrets-operator
1111
rbac.authorization.k8s.io/aggregate-to-edit: "true"
1212
rbac.authorization.k8s.io/aggregate-to-admin: "true"
@@ -18,6 +18,7 @@ rules:
1818
- "secretstores"
1919
- "clustersecretstores"
2020
- "pushsecrets"
21+
- "clusterpushsecrets"
2122
verbs:
2223
- "create"
2324
- "delete"
@@ -35,10 +36,13 @@ rules:
3536
- "githubaccesstokens"
3637
- "quayaccesstokens"
3738
- "passwords"
39+
- "sshkeys"
3840
- "vaultdynamicsecrets"
3941
- "webhooks"
4042
- "grafanas"
4143
- "generatorstates"
44+
- "mfas"
45+
- "uuids"
4246
verbs:
4347
- "create"
4448
- "delete"

bindata/external-secrets/resources/clusterrole_external-secrets-servicebindings.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ metadata:
77
servicebinding.io/controller: "true"
88
app.kubernetes.io/name: external-secrets
99
app.kubernetes.io/instance: external-secrets
10-
app.kubernetes.io/version: "v0.14.3"
10+
app.kubernetes.io/version: "v0.19.0"
1111
app.kubernetes.io/managed-by: external-secrets-operator
1212
rules:
1313
- apiGroups:
1414
- "external-secrets.io"
1515
resources:
1616
- "externalsecrets"
17+
- "pushsecrets"
1718
verbs:
1819
- "get"
1920
- "list"

bindata/external-secrets/resources/clusterrole_external-secrets-view.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app.kubernetes.io/name: external-secrets
88
app.kubernetes.io/instance: external-secrets
9-
app.kubernetes.io/version: "v0.14.3"
9+
app.kubernetes.io/version: "v0.19.0"
1010
app.kubernetes.io/managed-by: external-secrets-operator
1111
rbac.authorization.k8s.io/aggregate-to-view: "true"
1212
rbac.authorization.k8s.io/aggregate-to-edit: "true"
@@ -19,6 +19,7 @@ rules:
1919
- "secretstores"
2020
- "clustersecretstores"
2121
- "pushsecrets"
22+
- "clusterpushsecrets"
2223
verbs:
2324
- "get"
2425
- "watch"
@@ -34,10 +35,13 @@ rules:
3435
- "githubaccesstokens"
3536
- "quayaccesstokens"
3637
- "passwords"
38+
- "sshkeys"
3739
- "vaultdynamicsecrets"
3840
- "webhooks"
3941
- "grafanas"
4042
- "generatorstates"
43+
- "mfas"
44+
- "uuids"
4145
verbs:
4246
- "get"
4347
- "watch"

0 commit comments

Comments
 (0)