Skip to content

Commit 490f52d

Browse files
fix(deps): update module github.com/openmcp-project/openmcp-operator/lib to v0.12.0 (#148)
* fix(deps): update module github.com/openmcp-project/openmcp-operator/lib to v0.12.0 * update --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: René Schünemann <[email protected]>
1 parent 168e450 commit 490f52d

File tree

4 files changed

+40
-25
lines changed

4 files changed

+40
-25
lines changed

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ require (
1515
github.com/onsi/gomega v1.38.2
1616
github.com/openmcp-project/cluster-provider-gardener/api v0.3.0
1717
github.com/openmcp-project/control-plane-operator v0.1.12
18-
github.com/openmcp-project/controller-utils v0.16.0
18+
github.com/openmcp-project/controller-utils v0.19.0
1919
github.com/openmcp-project/mcp-operator/api v0.35.2
20-
github.com/openmcp-project/openmcp-operator/api v0.10.0
21-
github.com/openmcp-project/openmcp-operator/lib v0.10.0
20+
github.com/openmcp-project/openmcp-operator/api v0.12.0
21+
github.com/openmcp-project/openmcp-operator/lib v0.12.0
2222
github.com/openmcp-project/service-provider-landscaper v0.4.0
2323
github.com/spf13/cobra v1.10.1
2424
github.com/spf13/pflag v1.0.10
@@ -43,7 +43,7 @@ require (
4343
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4444
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4545
github.com/fatih/color v1.18.0 // indirect
46-
github.com/fluxcd/pkg/apis/kustomize v1.10.0 // indirect
46+
github.com/fluxcd/pkg/apis/kustomize v1.12.0 // indirect
4747
github.com/fsnotify/fsnotify v1.9.0 // indirect
4848
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4949
github.com/gardener/component-spec/bindings-go v0.0.98 // indirect
@@ -71,7 +71,7 @@ require (
7171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7272
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7373
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
74-
github.com/openmcp-project/controller-utils/api v0.16.0 // indirect
74+
github.com/openmcp-project/controller-utils/api v0.19.0 // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
7676
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7777
github.com/prometheus/client_golang v1.22.0 // indirect
@@ -88,7 +88,7 @@ require (
8888
go.uber.org/zap v1.27.0 // indirect
8989
go.yaml.in/yaml/v2 v2.4.2 // indirect
9090
go.yaml.in/yaml/v3 v3.0.4 // indirect
91-
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
91+
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
9292
golang.org/x/mod v0.27.0 // indirect
9393
golang.org/x/net v0.43.0 // indirect
9494
golang.org/x/oauth2 v0.30.0 // indirect

go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjT
2727
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
2828
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
2929
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
30-
github.com/fluxcd/pkg/apis/kustomize v1.10.0 h1:47EeSzkQvlQZdH92vHMe2lK2iR8aOSEJq95avw5idts=
31-
github.com/fluxcd/pkg/apis/kustomize v1.10.0/go.mod h1:UsqMV4sqNa1Yg0pmTsdkHRJr7bafBOENIJoAN+3ezaQ=
30+
github.com/fluxcd/pkg/apis/kustomize v1.12.0 h1:KvZN6xwgP/dNSeckL4a/Uv715XqiN1C3xS+jGcPejtE=
31+
github.com/fluxcd/pkg/apis/kustomize v1.12.0/go.mod h1:OojLxIdKm1JAAdh3sL4j4F+vfrLKb7kq1vr8bpyEKgg=
3232
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
3333
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
3434
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
@@ -112,14 +112,14 @@ github.com/openmcp-project/cluster-provider-gardener/api v0.3.0 h1:KVnpvhEFgNA3G
112112
github.com/openmcp-project/cluster-provider-gardener/api v0.3.0/go.mod h1:kQQ68UM/tSqwRytGXiBdwxgbNz2i1RF0L5t8vf7akJg=
113113
github.com/openmcp-project/control-plane-operator v0.1.12 h1:g/SbNAnQnlkuVB31O2+ZhUpoab/vnH2tXNVNwZ3Y3gY=
114114
github.com/openmcp-project/control-plane-operator v0.1.12/go.mod h1:dSFqUTbiNnqGzS4Umy8AndBi2QBPpqEUsdainA8KVEI=
115-
github.com/openmcp-project/controller-utils v0.16.0 h1:m7j+FGjLONix6VtZFxT2lIORobDg7hrJ4fKroHuv5QQ=
116-
github.com/openmcp-project/controller-utils v0.16.0/go.mod h1:b0IZGgTiAyuiXiQ/necY7C5UVtrSmdjajRWzSRKkNcA=
117-
github.com/openmcp-project/controller-utils/api v0.16.0 h1:gFI5kgSANuzpF4RQ1JyTZn+2eXuVRGzJGBFzEo3OXjg=
118-
github.com/openmcp-project/controller-utils/api v0.16.0/go.mod h1:vJLFwuqyElkiP0DjkWYRSH0DjCxWrM0+uiS7ck1ncUs=
119-
github.com/openmcp-project/openmcp-operator/api v0.10.0 h1:+3Pwz7esGwBKmE4Q861rKv5AZdKicdCbmWbu1bqc5h8=
120-
github.com/openmcp-project/openmcp-operator/api v0.10.0/go.mod h1:8PexUhnIukhbjTA5ybxo86vh6W3FNzfHEhC86770MRs=
121-
github.com/openmcp-project/openmcp-operator/lib v0.10.0 h1:rhlyGso5HSkGaD/SLJ0kE1Jb1Bpa/ioWphQppYQ3poA=
122-
github.com/openmcp-project/openmcp-operator/lib v0.10.0/go.mod h1:TnSUCkUXVa9dWzcix8wMvp3vYM0a3wVmu3DZMj7YXD4=
115+
github.com/openmcp-project/controller-utils v0.19.0 h1:D4Ht3LI/Ue5yk2wdAnJEpChUVmB6xM7kglwhn7a2J3g=
116+
github.com/openmcp-project/controller-utils v0.19.0/go.mod h1:zxcbcmedLdlQ//X/nwdPvq/nM3ikyR13DbOivou2I4Y=
117+
github.com/openmcp-project/controller-utils/api v0.19.0 h1:2wOiLtHLVYeCSDxWJrCqCiFAxircAQ2EONIwq3QuZSI=
118+
github.com/openmcp-project/controller-utils/api v0.19.0/go.mod h1:qsvVfsL3xeeJ9keiKVMa50VOWmr+uR0VVejmQ7FCH18=
119+
github.com/openmcp-project/openmcp-operator/api v0.12.0 h1:g3Q0VFNsggDmMD4r+RmtiNwGohzu2JfEqp4RtlT5b1A=
120+
github.com/openmcp-project/openmcp-operator/api v0.12.0/go.mod h1:malWxgwCmDPeNklWe23rw9f9cvmq6LdIxlKmvqcYMqw=
121+
github.com/openmcp-project/openmcp-operator/lib v0.12.0 h1:lPvuPH7dqgcPmw58bL5eUJ4+/kcFYEPFP5OHcmYxljg=
122+
github.com/openmcp-project/openmcp-operator/lib v0.12.0/go.mod h1:fsuMuyBanhyh7zYdgxLxIvbM3iEFnF7MsLRQjSx3SCk=
123123
github.com/openmcp-project/service-provider-landscaper v0.4.0 h1:H55q5whlcb1fyhY7/dkeigcp9UPXZQj+WDI57XVY4vY=
124124
github.com/openmcp-project/service-provider-landscaper v0.4.0/go.mod h1:5VU8eJ5nA2Kz0Kc4qbmw6ocMNCgLKzDu5mX6w5hOHa8=
125125
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -184,8 +184,8 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
184184
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
185185
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
186186
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
187-
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 h1:R9PFI6EUdfVKgwKjZef7QIwGcBKu86OEFpJ9nUEP2l4=
188-
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc=
187+
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0=
188+
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
189189
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
190190
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
191191
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
@@ -223,8 +223,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
223223
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
224224
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
225225
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
226-
golang.org/x/tools/go/expect v0.1.0-deprecated h1:jY2C5HGYR5lqex3gEniOQL0r7Dq5+VGVgY1nudX5lXY=
227-
golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
226+
golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
227+
golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
228228
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
229229
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
230230
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/controller/core/apiserver/controller_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@ var _ = Describe("CO-1153 APIServer Controller", func() {
351351

352352
cr := &clustersv1alpha1.ClusterRequest{}
353353
cr.Name = as.Name
354-
cr.Namespace = openmcpclusterutils.StableRequestNamespace(as.Namespace)
354+
cr.Namespace, err = openmcpclusterutils.StableMCPNamespace(as.Name, as.Namespace)
355+
Expect(err).NotTo(HaveOccurred())
355356
Expect(env.Client(testutils.LaaSCoreCluster).Get(env.Ctx, client.ObjectKeyFromObject(cr), cr)).To(Succeed())
356357

357358
Expect(env.Client(testutils.CrateCluster).Get(env.Ctx, client.ObjectKeyFromObject(as), as)).To(Succeed())

internal/controller/core/apiserver/v2.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer,
5555

5656
// instead of calling a handler, create a ClusterRequest and an AccessRequest
5757
// ensure namespace, because this is created on the platform cluster
58-
nsName := openmcpclusterutils.StableRequestNamespace(as.Namespace)
58+
nsName, err := openmcpclusterutils.StableMCPNamespace(as.Name, as.Namespace)
59+
if err != nil {
60+
rerr := openmcperrors.WithReason(fmt.Errorf("failed to compute stable namespace for APIServer %s/%s: %w", as.Namespace, as.Name, err), clustersconst.ReasonInternalError)
61+
return ctrl.Result{}, nil, clusterConditions(false, rerr.Reason(), rerr.Error(), clusterRequestGrantedCon, clusterReadyCon, accessRequestGrantedCon), rerr
62+
}
5963
nsm := resources.NewNamespaceMutator(nsName)
6064
nsm.MetadataMutator().WithLabels(map[string]string{
6165
openmcpv1alpha1.V1MCPReferenceLabelNamespace: as.Namespace,
@@ -306,7 +310,14 @@ func v2HandleDelete(ctx context.Context, as *openmcpv1alpha1.APIServer, platform
306310
}
307311

308312
// instead of calling a handler, remove AccessRequest and ClusterRequest
309-
nsName := openmcpclusterutils.StableRequestNamespace(as.Namespace)
313+
nsName, err := openmcpclusterutils.StableMCPNamespace(as.Name, as.Namespace)
314+
if err != nil {
315+
rerr := openmcperrors.WithReason(fmt.Errorf("failed to compute stable namespace for APIServer %s/%s: %w", as.Namespace, as.Name, err), clustersconst.ReasonInternalError)
316+
accessRequestDeletedCon.Status = openmcpv1alpha1.ComponentConditionStatusFalse
317+
accessRequestDeletedCon.Reason = rerr.Reason()
318+
accessRequestDeletedCon.Message = err.Error()
319+
return ctrl.Result{}, nil, clusterConditions(false, rerr.Reason(), rerr.Error(), accessRequestDeletedCon, clusterRequestDeletedCon), rerr
320+
}
310321

311322
// remove AccessRequest
312323
ar := &clustersv1alpha1.AccessRequest{}
@@ -480,9 +491,12 @@ func (m *AccessRequestMutator) Mutate(r *clustersv1alpha1.AccessRequest) error {
480491
r.Spec.RequestRef.Name = m.refName
481492
r.Spec.RequestRef.Namespace = m.refNamespace
482493
}
483-
r.Spec.Permissions = make([]clustersv1alpha1.PermissionsRequest, len(m.permissions))
494+
if r.Spec.Token == nil {
495+
r.Spec.Token = &clustersv1alpha1.TokenConfig{}
496+
}
497+
r.Spec.Token.Permissions = make([]clustersv1alpha1.PermissionsRequest, len(m.permissions))
484498
for i, perm := range m.permissions {
485-
r.Spec.Permissions[i] = *perm.DeepCopy()
499+
r.Spec.Token.Permissions[i] = *perm.DeepCopy()
486500
}
487501
return m.meta.Mutate(r)
488502
}

0 commit comments

Comments
 (0)