Skip to content

Commit 63650f5

Browse files
cbarbian-sapcbarbian-sap
committed
2 parents 864a55f + d33e5e5 commit 63650f5

File tree

18 files changed

+260
-484
lines changed

18 files changed

+260
-484
lines changed

‎build/controller/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### build go executable
2-
FROM --platform=$BUILDPLATFORM golang:1.22.5 as build
2+
FROM --platform=$BUILDPLATFORM golang:1.23.0 AS build
33

44
WORKDIR /go/src
55

‎build/webhook/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### build go executable
2-
FROM --platform=$BUILDPLATFORM golang:1.22.5 as build
2+
FROM --platform=$BUILDPLATFORM golang:1.23.0 AS build
33

44
WORKDIR /go/src
55

‎go.mod

+33-31
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
module github.com/sap/clustersecret-operator
22

3-
go 1.19
3+
go 1.23.0
44

55
require (
6-
github.com/evanphx/json-patch/v5 v5.6.0
7-
github.com/google/uuid v1.3.1
6+
github.com/evanphx/json-patch/v5 v5.9.0
7+
github.com/google/uuid v1.6.0
88
github.com/hashicorp/go-multierror v1.1.1
99
github.com/spf13/pflag v1.0.5
1010
gopkg.in/yaml.v3 v3.0.1
11-
k8s.io/api v0.27.1
12-
k8s.io/apimachinery v0.27.1
13-
k8s.io/client-go v0.27.1
14-
k8s.io/code-generator v0.27.2
15-
k8s.io/klog/v2 v2.90.1
16-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
11+
k8s.io/api v0.31.0
12+
k8s.io/apimachinery v0.31.0
13+
k8s.io/client-go v0.31.0
14+
k8s.io/code-generator v0.31.0
15+
k8s.io/klog/v2 v2.130.1
16+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
1717
)
1818

1919
require (
20-
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
22-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
23-
github.com/go-logr/logr v1.2.3 // indirect
20+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
21+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
22+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
23+
github.com/go-logr/logr v1.4.2 // indirect
2424
github.com/go-openapi/jsonpointer v0.19.6 // indirect
25-
github.com/go-openapi/jsonreference v0.20.1 // indirect
26-
github.com/go-openapi/swag v0.22.3 // indirect
25+
github.com/go-openapi/jsonreference v0.20.2 // indirect
26+
github.com/go-openapi/swag v0.22.4 // indirect
2727
github.com/gogo/protobuf v1.3.2 // indirect
2828
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
29-
github.com/golang/protobuf v1.5.3 // indirect
30-
github.com/google/gnostic v0.6.9 // indirect
31-
github.com/google/go-cmp v0.5.9 // indirect
29+
github.com/golang/protobuf v1.5.4 // indirect
30+
github.com/google/gnostic-models v0.6.8 // indirect
31+
github.com/google/go-cmp v0.6.0 // indirect
3232
github.com/google/gofuzz v1.2.0 // indirect
3333
github.com/hashicorp/errwrap v1.1.0 // indirect
3434
github.com/imdario/mergo v0.3.13 // indirect
@@ -39,21 +39,23 @@ require (
3939
github.com/modern-go/reflect2 v1.0.2 // indirect
4040
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4141
github.com/pkg/errors v0.9.1 // indirect
42-
golang.org/x/mod v0.10.0 // indirect
43-
golang.org/x/net v0.9.0 // indirect
44-
golang.org/x/oauth2 v0.1.0 // indirect
45-
golang.org/x/sys v0.7.0 // indirect
46-
golang.org/x/term v0.7.0 // indirect
47-
golang.org/x/text v0.9.0 // indirect
42+
github.com/x448/float16 v0.8.4 // indirect
43+
golang.org/x/mod v0.17.0 // indirect
44+
golang.org/x/net v0.26.0 // indirect
45+
golang.org/x/oauth2 v0.21.0 // indirect
46+
golang.org/x/sync v0.7.0 // indirect
47+
golang.org/x/sys v0.21.0 // indirect
48+
golang.org/x/term v0.21.0 // indirect
49+
golang.org/x/text v0.16.0 // indirect
4850
golang.org/x/time v0.3.0 // indirect
49-
golang.org/x/tools v0.8.0 // indirect
50-
google.golang.org/appengine v1.6.7 // indirect
51-
google.golang.org/protobuf v1.28.1 // indirect
51+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
52+
google.golang.org/protobuf v1.34.2 // indirect
53+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5254
gopkg.in/inf.v0 v0.9.1 // indirect
5355
gopkg.in/yaml.v2 v2.4.0 // indirect
54-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
55-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
56-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
56+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
57+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
58+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
5759
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
58-
sigs.k8s.io/yaml v1.3.0 // indirect
60+
sigs.k8s.io/yaml v1.4.0 // indirect
5961
)

‎go.sum

+82-194
Large diffs are not rendered by default.

‎hack/update-codegen.sh

+18-11
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,31 @@ if ! which go >/dev/null; then
99
exit 1
1010
fi
1111

12-
cd $(dirname "${BASH_SOURCE[0]}")/..
12+
cd "$(dirname "${BASH_SOURCE[0]}")"/..
1313

1414
go mod download k8s.io/code-generator
1515
CODEGEN_PKG=$(go list -m -f '{{.Dir}}' k8s.io/code-generator)
1616
GEN_PKG_PATH=$(go list -m)/pkg
17-
OUTPUT_BASE=$(mktemp -d)
18-
19-
trap 'rm -rf "${OUTPUT_BASE}"' EXIT
17+
OUTPUT_PATH=$(mktemp -d)
18+
trap 'rm -rf "${OUTPUT_PATH}"' EXIT
2019

2120
# echo "PWD: ${PWD}"
2221
# echo "CODEGEN_PKG: ${CODEGEN_PKG}"
2322
# echo "GEN_PKG_PATH: ${GEN_PKG_PATH}"
24-
# echo "OUTPUT_BASE: ${OUTPUT_BASE}"
23+
# echo "OUTPUT_PATH: ${OUTPUT_PATH}"
24+
25+
source "${CODEGEN_PKG}"/kube_codegen.sh
26+
27+
kube::codegen::gen_helpers \
28+
--boilerplate ./hack/boilerplate.go.txt \
29+
./pkg/apis
2530

26-
/bin/bash "${CODEGEN_PKG}"/generate-groups.sh all \
27-
"${GEN_PKG_PATH}"/client "${GEN_PKG_PATH}"/apis \
28-
core.cs.sap.com:v1alpha1 \
29-
--output-base "${OUTPUT_BASE}"/ \
30-
--go-header-file ./hack/boilerplate.go.txt
31+
kube::codegen::gen_client \
32+
--with-watch \
33+
--with-applyconfig \
34+
--output-dir "${OUTPUT_PATH}"/client \
35+
--output-pkg "${GEN_PKG_PATH}"/client \
36+
--boilerplate ./hack/boilerplate.go.txt \
37+
./pkg/apis
3138

32-
rm -rf "./pkg/client" && cp -Rf "${OUTPUT_BASE}"/"${GEN_PKG_PATH}" .
39+
rm -rf "./pkg/client" && cp -Rf "${OUTPUT_PATH}"/client ./pkg

‎internal/controller/controller_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestController1(t *testing.T) {
2929
defer cancel()
3030

3131
clusterSecret := env.MustFatal(t).CreateClusterSecretFromFile("clustersecret.yaml")
32-
clusterSecret = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret)
32+
_ = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret)
3333
env.MustError(t).AssertSecretFromFile("secret.yaml")
3434
}
3535

@@ -76,7 +76,7 @@ func TestController2(t *testing.T) {
7676
env.MustError(t).AssertSecretFromFile("secret-4.yaml")
7777

7878
env.CreateNamespaceFromFile("namespace-5.yaml")
79-
clusterSecret = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret)
79+
_ = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret)
8080
env.MustError(t).AssertSecretCount("", "clustersecrets.core.cs.sap.com/name=my-secret", 2)
8181
env.MustError(t).AssertSecretFromFile("secret-4.yaml")
8282
env.MustError(t).AssertSecretFromFile("secret-5.yaml")
@@ -106,13 +106,13 @@ func TestController3(t *testing.T) {
106106
env.MustError(t).AssertSecretFromFile("secret-a-1.yaml")
107107

108108
env.MustFatal(t).UpdateClusterSecretFromFile("clustersecret-a-updated.yaml")
109-
clusterSecret_a = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_a)
109+
_ = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_a)
110110
env.MustError(t).AssertSecretCount("", "clustersecrets.core.cs.sap.com/name=my-secret-a", 2)
111111
env.MustError(t).AssertSecretFromFile("secret-a-updated-1.yaml")
112112
env.MustError(t).AssertSecretFromFile("secret-a-updated-2.yaml")
113113

114114
clusterSecret_b := env.MustFatal(t).CreateClusterSecretFromFile("clustersecret-b.yaml")
115-
clusterSecret_b = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_b)
115+
_ = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_b)
116116
env.MustError(t).AssertSecretCount("", "clustersecrets.core.cs.sap.com/name", 3)
117117
env.MustError(t).AssertSecretFromFile("secret-a-updated-1.yaml")
118118
env.MustError(t).AssertSecretFromFile("secret-a-updated-2.yaml")
@@ -146,7 +146,7 @@ func TestController4(t *testing.T) {
146146
defer cancel()
147147

148148
clusterSecret_a = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_a)
149-
clusterSecret_b = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_b)
149+
_ = env.MustFatal(t).WaitForClusterSecretReady(clusterSecret_b)
150150
env.MustError(t).AssertSecretCount("", "clustersecrets.core.cs.sap.com/name", 2)
151151
env.MustError(t).AssertSecret(secret_a_1)
152152
env.MustError(t).AssertSecret(secret_b_2)

‎internal/controller/reconcile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (c *Controller) reconcileNamespace(namespaceName string) error {
5353
if errors.IsNotFound(err) {
5454
// that is a bit strange, since this should be only triggered after namespace create/update events
5555
// however it may happen if the namespace has been deleted concurrently
56-
klog.Warning("namespace %s does not exist; skipping reconcile", namespaceName)
56+
klog.Warningf("namespace %s does not exist; skipping reconcile", namespaceName)
5757
return nil
5858
} else {
5959
return err

‎pkg/client/applyconfiguration/core.cs.sap.com/v1alpha1/clustersecret.go

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/applyconfiguration/core.cs.sap.com/v1alpha1/clustersecretcondition.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/applyconfiguration/core.cs.sap.com/v1alpha1/clustersecretspec.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/applyconfiguration/core.cs.sap.com/v1alpha1/clustersecretstatus.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/applyconfiguration/core.cs.sap.com/v1alpha1/secrettemplatespec.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/applyconfiguration/utils.go

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/fake/clientset_generated.go

+38-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)