Skip to content

Commit 0dde396

Browse files
fix: go.mod dependencies (#122)
* fix: dependencies * fix(deps): pointer to meta.SecretKeyReference * fix(deps): pointer to meta.SecretKeyReference * chore: update xp-testing * feat: release v0.1.18 * chore: bump ocm version * fix: tests * chore(Dockerfile): update distroless dep * chore: update go.mod
1 parent a8065e3 commit 0dde396

File tree

10 files changed

+427
-429
lines changed

10 files changed

+427
-429
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Use distroless as minimal base image to package the manager binary
22
# Refer to https://github.com/GoogleContainerTools/distroless for more details
3-
FROM gcr.io/distroless/static:nonroot@sha256:627d6c5a23ad24e6bdff827f16c7b60e0289029b0c79e9f7ccd54ae3279fb45f
3+
FROM gcr.io/distroless/static:nonroot@sha256:e8a4044e0b4ae4257efa45fc026c0bc30ad320d43bd4c1a7d5271bd241e386d0
44
ARG TARGETARCH
55
WORKDIR /
66
COPY bin/manager-linux.${TARGETARCH} /manager

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.1.17-dev
1+
v0.1.18

charts/control-plane-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: control-plane-operator
33
description: A Helm chart for the Cloud Orchestration Control Plane Operator
44
type: application
5-
version: v0.1.17
6-
appVersion: v0.1.17
5+
version: v0.1.18
6+
appVersion: v0.1.18
77
home: https://github.com/openmcp-project/control-plane-operator
88
sources:
99
- https://github.com/openmcp-project/control-plane-operator

charts/control-plane-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image:
88
repository: ghcr.io/openmcp-project/images/control-plane-operator
99
pullPolicy: IfNotPresent
1010
# Overrides the image tag whose default is the chart appVersion.
11-
tag: v0.1.17
11+
tag: v0.1.18
1212

1313
imagePullSecrets: []
1414
nameOverride: ""

go.mod

Lines changed: 123 additions & 117 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 289 additions & 299 deletions
Large diffs are not rendered by default.

pkg/controlplane/components/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
var (
2424
tenantNamespace = "tenant-namespace"
2525
fluxSecretRef = &meta.KubeConfigReference{
26-
SecretRef: meta.SecretKeyReference{
26+
SecretRef: &meta.SecretKeyReference{
2727
Name: "some-secret",
2828
Key: "kubeconfig",
2929
},

pkg/juggler/fluxcd/flux_reconciler_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var errBoom = errors.New("boom")
2424
const testLabelComponentName = "flux.juggler.test.io/component"
2525

2626
func TestNewFluxReconciler(t *testing.T) {
27+
fakeClient := fake.NewFakeClient()
2728
tests := []struct {
2829
name string
2930
logger logr.Logger
@@ -45,13 +46,13 @@ func TestNewFluxReconciler(t *testing.T) {
4546
},
4647
{
4748
name: "New FluxReconciler with localClient and remoteClient",
48-
localClient: fake.NewFakeClient(),
49-
remoteClient: fake.NewFakeClient(),
49+
localClient: fakeClient,
50+
remoteClient: fakeClient,
5051
logger: logr.Logger{},
5152
expected: &FluxReconciler{
5253
logger: logr.Logger{},
53-
localClient: fake.NewFakeClient(),
54-
remoteClient: fake.NewFakeClient(),
54+
localClient: fakeClient,
55+
remoteClient: fakeClient,
5556
knownTypes: sets.Set[reflect.Type]{},
5657
},
5758
},

pkg/juggler/object/object_reconciler_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ func TestObjectReconciler_Uninstall(t *testing.T) {
386386
}
387387

388388
func TestNewReconciler(t *testing.T) {
389+
fakeClient := fake.NewFakeClient()
389390
tests := []struct {
390391
name string
391392
logger logr.Logger
@@ -405,9 +406,9 @@ func TestNewReconciler(t *testing.T) {
405406
{
406407
name: "New ObjectReconciler with remoteClient",
407408
logger: logr.Logger{},
408-
remoteClient: fake.NewFakeClient(),
409+
remoteClient: fakeClient,
409410
expected: &ObjectReconciler{
410-
remoteClient: fake.NewFakeClient(),
411+
remoteClient: fakeClient,
411412
logger: logr.Logger{},
412413
knownTypes: sets.Set[reflect.Type]{},
413414
},

pkg/utils/rcontext/rcontext.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type fluxKubeconfigKey struct{}
2828

2929
func WithFluxKubeconfigRef(ctx context.Context, ref *corev1.SecretReference) context.Context {
3030
return context.WithValue(ctx, fluxKubeconfigKey{}, &meta.KubeConfigReference{
31-
SecretRef: meta.SecretKeyReference{
31+
SecretRef: &meta.SecretKeyReference{
3232
Name: ref.Name,
3333
Key: "kubeconfig",
3434
},

0 commit comments

Comments
 (0)