Skip to content

Commit e78131c

Browse files
committed
fixup! feat: adds cluster's ownerref on cilium helm values source object
1 parent d6818db commit e78131c

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (p *provider) Apply(
8888
err := handlersutils.EnsureClusterOwnerReferenceForObject(
8989
ctx,
9090
p.client,
91-
&corev1.TypedLocalObjectReference{
91+
corev1.TypedLocalObjectReference{
9292
Kind: "Secret",
9393
Name: clusterConfig.Addons.CCM.Credentials.SecretRef.Name,
9494
},

pkg/handlers/generic/lifecycle/cni/cilium/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func (c *CiliumCNI) apply(
189189
err := handlersutils.EnsureClusterOwnerReferenceForObject(
190190
ctx,
191191
c.client,
192-
&corev1.TypedLocalObjectReference{
192+
corev1.TypedLocalObjectReference{
193193
Kind: cniVar.Values.SourceRef.Kind,
194194
Name: cniVar.Values.SourceRef.Name,
195195
},

pkg/handlers/generic/lifecycle/csi/nutanix/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (n *NutanixCSI) Apply(
112112
err := handlersutils.EnsureClusterOwnerReferenceForObject(
113113
ctx,
114114
n.client,
115-
&corev1.TypedLocalObjectReference{
115+
corev1.TypedLocalObjectReference{
116116
Kind: "Secret",
117117
Name: provider.Credentials.SecretRef.Name,
118118
},

pkg/handlers/generic/mutation/imageregistries/credentials/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func ensureOwnerReferenceOnCredentialsSecrets(
291291
err := handlersutils.EnsureClusterOwnerReferenceForObject(
292292
ctx,
293293
c,
294-
&corev1.TypedLocalObjectReference{
294+
corev1.TypedLocalObjectReference{
295295
Kind: "Secret",
296296
Name: secretName,
297297
},

pkg/handlers/utils/secrets.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func CopySecretToRemoteCluster(
7070
func EnsureClusterOwnerReferenceForObject(
7171
ctx context.Context,
7272
cl ctrlclient.Client,
73-
objectRef *corev1.TypedLocalObjectReference,
73+
objectRef corev1.TypedLocalObjectReference,
7474
cluster *clusterv1.Cluster,
7575
) error {
7676
targetObj, err := GetResourceFromTypedLocalObjectReference(
@@ -99,7 +99,7 @@ func EnsureClusterOwnerReferenceForObject(
9999
func GetResourceFromTypedLocalObjectReference(
100100
ctx context.Context,
101101
cl ctrlclient.Client,
102-
typedLocalObjectRef *corev1.TypedLocalObjectReference,
102+
typedLocalObjectRef corev1.TypedLocalObjectReference,
103103
ns string,
104104
) (*unstructured.Unstructured, error) {
105105
apiVersion := corev1.SchemeGroupVersion.String()

pkg/handlers/utils/secrets_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func Test_EnsureOwnerReferenceForSecret(t *testing.T) {
117117
err := EnsureClusterOwnerReferenceForObject(
118118
context.Background(),
119119
tt.client,
120-
&corev1.TypedLocalObjectReference{
120+
corev1.TypedLocalObjectReference{
121121
Kind: "Secret",
122122
Name: tt.secretName,
123123
},

0 commit comments

Comments
 (0)