Skip to content

Commit 15da9c8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1506 from nader-ziada/identity-owner
Remove owner ref from AzureClusterIdentity
2 parents 0d7b871 + 0dea87d commit 15da9c8

24 files changed

+44
-22
lines changed

‎controllers/azurecluster_controller.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"sigs.k8s.io/cluster-api/util"
3434
"sigs.k8s.io/cluster-api/util/annotations"
3535
"sigs.k8s.io/cluster-api/util/conditions"
36-
"sigs.k8s.io/cluster-api/util/patch"
3736
"sigs.k8s.io/cluster-api/util/predicates"
3837
ctrl "sigs.k8s.io/controller-runtime"
3938
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -162,16 +161,6 @@ func (r *AzureClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
162161
conditions.MarkFalse(azureCluster, infrav1.NetworkInfrastructureReadyCondition, infrav1.NamespaceNotAllowedByIdentity, clusterv1.ConditionSeverityError, "")
163162
return reconcile.Result{}, errors.New("AzureClusterIdentity list of allowed namespaces doesn't include current cluster namespace")
164163
}
165-
if identity.Namespace == azureCluster.Namespace {
166-
patchhelper, err := patch.NewHelper(identity, r.Client)
167-
if err != nil {
168-
return reconcile.Result{}, errors.Wrap(err, "failed to init patch helper")
169-
}
170-
identity.ObjectMeta.OwnerReferences = azureCluster.GetOwnerReferences()
171-
if err := patchhelper.Patch(ctx, identity); err != nil {
172-
return reconcile.Result{}, err
173-
}
174-
}
175164
} else {
176165
warningMessage := ("You're using deprecated functionality: ")
177166
warningMessage += ("Using Azure credentials from the manager environment is deprecated and will be removed in future releases. ")

‎exp/controllers/azuremanagedcontrolplane_controller.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"time"
2323

2424
corev1 "k8s.io/api/core/v1"
25-
"sigs.k8s.io/cluster-api/util/patch"
2625

2726
"github.com/go-logr/logr"
2827
"github.com/pkg/errors"
@@ -205,16 +204,6 @@ func (r *AzureManagedControlPlaneReconciler) Reconcile(ctx context.Context, req
205204
if !scope.IsClusterNamespaceAllowed(ctx, r.Client, identity.Spec.AllowedNamespaces, azureControlPlane.Namespace) {
206205
return reconcile.Result{}, errors.New("AzureClusterIdentity list of allowed namespaces doesn't include current azure managed control plane namespace")
207206
}
208-
if identity.Namespace == azureControlPlane.Namespace {
209-
patchHelper, err := patch.NewHelper(identity, r.Client)
210-
if err != nil {
211-
return reconcile.Result{}, errors.Wrap(err, "failed to init patch helper")
212-
}
213-
identity.ObjectMeta.OwnerReferences = azureControlPlane.GetOwnerReferences()
214-
if err := patchHelper.Patch(ctx, identity); err != nil {
215-
return reconcile.Result{}, err
216-
}
217-
}
218207
} else {
219208
warningMessage := ("You're using deprecated functionality: ")
220209
warningMessage += ("Using Azure credentials from the manager environment is deprecated and will be removed in future releases. ")

‎templates/azure-cluster-identity/azure-cluster-identity.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
33
kind: AzureClusterIdentity
44
metadata:
55
name: "${CLUSTER_IDENTITY_NAME}"
6+
labels:
7+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
68
spec:
79
type: ServicePrincipal
810
allowedNamespaces: {}

‎templates/cluster-template-aad.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ spec:
210210
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
211211
kind: AzureClusterIdentity
212212
metadata:
213+
labels:
214+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
213215
name: ${CLUSTER_IDENTITY_NAME}
214216
namespace: default
215217
spec:

‎templates/cluster-template-aks.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ spec:
102102
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
103103
kind: AzureClusterIdentity
104104
metadata:
105+
labels:
106+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
105107
name: ${CLUSTER_IDENTITY_NAME}
106108
namespace: default
107109
spec:

‎templates/cluster-template-azure-bastion.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ spec:
203203
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
204204
kind: AzureClusterIdentity
205205
metadata:
206+
labels:
207+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
206208
name: ${CLUSTER_IDENTITY_NAME}
207209
namespace: default
208210
spec:

‎templates/cluster-template-ephemeral.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ spec:
207207
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
208208
kind: AzureClusterIdentity
209209
metadata:
210+
labels:
211+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
210212
name: ${CLUSTER_IDENTITY_NAME}
211213
namespace: default
212214
spec:

‎templates/cluster-template-external-cloud-provider.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ spec:
202202
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
203203
kind: AzureClusterIdentity
204204
metadata:
205+
labels:
206+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
205207
name: ${CLUSTER_IDENTITY_NAME}
206208
namespace: default
207209
spec:

‎templates/cluster-template-ipv6.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ spec:
181181
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
182182
kind: AzureClusterIdentity
183183
metadata:
184+
labels:
185+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
184186
name: ${CLUSTER_IDENTITY_NAME}
185187
namespace: default
186188
spec:

‎templates/cluster-template-machinepool-windows.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ spec:
156156
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
157157
kind: AzureClusterIdentity
158158
metadata:
159+
labels:
160+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
159161
name: ${CLUSTER_IDENTITY_NAME}
160162
namespace: default
161163
spec:

0 commit comments

Comments
 (0)