Skip to content

Commit 0dabaa6

Browse files
ESO-51: Implements the functionality to ensure Service, ServiceAccount and Deployment resources stay in desired state (#12)
* adds vendor * Adds service, serviceAccount, deployment resources # Conflicts: # pkg/controller/constants.go # pkg/controller/install_external_secrets.go # pkg/controller/test_utils.go # pkg/controller/utils.go * adds units test for service and serviceAccount changes * Adds unit test for deployment
1 parent 7332db6 commit 0dabaa6

File tree

1,296 files changed

+232259
-16103
lines changed

Some content is hidden

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

1,296 files changed

+232259
-16103
lines changed

api/v1alpha1/external_secrets_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ type ExternalSecretsSpec struct {
6767
type ExternalSecretsStatus struct {
6868
// conditions holds information of the current state of the external-secrets deployment.
6969
ConditionalStatus `json:",inline,omitempty"`
70+
71+
// externalSecretsImage is the name of the image and the tag used for deploying external-secrets.
72+
ExternalSecretsImage string `json:"externalSecretsImage,omitempty"`
7073
}
7174

7275
// ExternalSecretsConfig is for configuring the external-secrets behavior.

config/crd/bases/operator.openshift.io_externalsecrets.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,13 @@ spec:
12781278
x-kubernetes-list-map-keys:
12791279
- type
12801280
x-kubernetes-list-type: map
1281+
externalSecretsImage:
1282+
description: externalSecretsImage is the name of the image and the
1283+
tag used for deploying external-secrets.
1284+
type: string
1285+
serviceAccount:
1286+
description: serviceAccount created by the controller for the external-secrets.
1287+
type: string
12811288
type: object
12821289
type: object
12831290
x-kubernetes-validations:

go.mod

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ require (
1212
github.com/onsi/gomega v1.36.1
1313
github.com/openshift/build-machinery-go v0.0.0-20250414185254-3ce8e800ceda
1414
go.uber.org/zap v1.27.0
15-
k8s.io/api v0.32.0
16-
k8s.io/apimachinery v0.32.0
17-
k8s.io/client-go v0.32.0
15+
k8s.io/api v0.32.1
16+
k8s.io/apimachinery v0.32.1
17+
k8s.io/client-go v0.32.1
18+
k8s.io/kubernetes v1.32.1
1819
sigs.k8s.io/controller-runtime v0.20.1
1920
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250308055145-5fe7bb3edc86
2021
sigs.k8s.io/controller-tools v0.16.1
21-
sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
22+
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0
2223
)
2324

2425
require (
@@ -35,6 +36,7 @@ require (
3536
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
3637
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
3738
github.com/Masterminds/semver/v3 v3.2.1 // indirect
39+
github.com/NYTimes/gziphandler v1.1.1 // indirect
3840
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
3941
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
4042
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
@@ -60,10 +62,13 @@ require (
6062
github.com/charithe/durationcheck v0.0.10 // indirect
6163
github.com/chavacava/garif v0.1.0 // indirect
6264
github.com/ckaznocha/intrange v0.1.2 // indirect
65+
github.com/coreos/go-semver v0.3.1 // indirect
66+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6367
github.com/curioswitch/go-reassign v0.2.0 // indirect
6468
github.com/daixiang0/gci v0.13.4 // indirect
6569
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6670
github.com/denis-tingaikin/go-header v0.5.0 // indirect
71+
github.com/distribution/reference v0.6.0 // indirect
6772
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6873
github.com/ettle/strcase v0.2.0 // indirect
6974
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
@@ -117,6 +122,7 @@ require (
117122
github.com/gostaticanalysis/comment v1.4.2 // indirect
118123
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
119124
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
125+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
120126
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
121127
github.com/hashicorp/go-version v1.7.0 // indirect
122128
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
@@ -135,6 +141,7 @@ require (
135141
github.com/klauspost/compress v1.17.11 // indirect
136142
github.com/kulti/thelper v0.6.3 // indirect
137143
github.com/kunwardeep/paralleltest v1.0.10 // indirect
144+
github.com/kylelemons/godebug v1.1.0 // indirect
138145
github.com/kyoh86/exportloopref v0.1.11 // indirect
139146
github.com/lasiar/canonicalheader v1.1.1 // indirect
140147
github.com/ldez/gomoddirectives v0.2.4 // indirect
@@ -163,6 +170,7 @@ require (
163170
github.com/nishanths/predeclared v0.2.2 // indirect
164171
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
165172
github.com/olekukonko/tablewriter v0.0.5 // indirect
173+
github.com/opencontainers/go-digest v1.0.0 // indirect
166174
github.com/pelletier/go-toml v1.9.5 // indirect
167175
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
168176
github.com/pkg/errors v0.9.1 // indirect
@@ -222,7 +230,11 @@ require (
222230
gitlab.com/bosi/decorder v0.4.2 // indirect
223231
go-simpler.org/musttag v0.12.2 // indirect
224232
go-simpler.org/sloglint v0.7.1 // indirect
233+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
234+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
235+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
225236
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
237+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
226238
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
227239
go.opentelemetry.io/otel v1.33.0 // indirect
228240
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
@@ -231,9 +243,9 @@ require (
231243
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
232244
go.opentelemetry.io/otel/trace v1.33.0 // indirect
233245
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
234-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
235246
go.uber.org/automaxprocs v1.5.3 // indirect
236247
go.uber.org/multierr v1.11.0 // indirect
248+
golang.org/x/crypto v0.36.0 // indirect
237249
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
238250
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
239251
golang.org/x/mod v0.22.0 // indirect
@@ -253,23 +265,29 @@ require (
253265
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
254266
gopkg.in/inf.v0 v0.9.1 // indirect
255267
gopkg.in/ini.v1 v1.67.0 // indirect
268+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
256269
gopkg.in/yaml.v2 v2.4.0 // indirect
257270
gopkg.in/yaml.v3 v3.0.1 // indirect
258271
honnef.co/go/tools v0.4.7 // indirect
259-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
260-
k8s.io/apiserver v0.32.0 // indirect
261-
k8s.io/component-base v0.32.0 // indirect
272+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
273+
k8s.io/apiserver v0.32.1 // indirect
274+
k8s.io/cloud-provider v0.32.1 // indirect
275+
k8s.io/component-base v0.32.1 // indirect
276+
k8s.io/component-helpers v0.32.1 // indirect
277+
k8s.io/controller-manager v0.32.1 // indirect
262278
k8s.io/klog/v2 v2.130.1 // indirect
263-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
264-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
279+
k8s.io/kms v0.32.1 // indirect
280+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
281+
k8s.io/kubelet v0.32.1 //indirect
282+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
265283
mvdan.cc/gofumpt v0.6.0 // indirect
266284
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
267285
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
268286
sigs.k8s.io/gateway-api v1.1.0 // indirect
269287
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
270-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
271-
sigs.k8s.io/kustomize/cmd/config v0.14.2 // indirect
272-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
288+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
289+
sigs.k8s.io/kustomize/cmd/config v0.15.0 // indirect
290+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
273291
sigs.k8s.io/randfill v1.0.0 // indirect
274292
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
275293
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)