Skip to content

Commit 4ff1f24

Browse files
mboersmamboersma
committed
Set managed MP dataSecretNames to non-empty to satisfy validation
1 parent b7d51f2 commit 4ff1f24

12 files changed

+21
-21
lines changed

‎controllers/agentpooladopt_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func (r *AgentPoolAdoptReconciler) Reconcile(ctx context.Context, req ctrl.Reque
172172
Template: clusterv1.MachineTemplateSpec{
173173
Spec: clusterv1.MachineSpec{
174174
Bootstrap: clusterv1.Bootstrap{
175-
DataSecretName: ptr.To(""),
175+
DataSecretName: ptr.To("unused"),
176176
},
177177
ClusterName: clusterName,
178178
InfrastructureRef: corev1.ObjectReference{

‎docs/book/src/managed/troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
metadata: {}
3232
spec:
3333
bootstrap:
34-
dataSecretName: ""
34+
dataSecretName: "unused"
3535
clusterName: capz-managed-aks
3636
infrastructureRef:
3737
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -68,7 +68,7 @@ spec:
6868
metadata: {}
6969
spec:
7070
bootstrap:
71-
dataSecretName: ""
71+
dataSecretName: "unused"
7272
clusterName: capz-managed-aks
7373
infrastructureRef:
7474
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎templates/cluster-template-aks-aso.yaml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-aks.yaml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/flavors/aks-aso/cluster-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
metadata: {}
6666
spec:
6767
bootstrap:
68-
dataSecretName: ""
68+
dataSecretName: "unused"
6969
clusterName: "${CLUSTER_NAME}"
7070
infrastructureRef:
7171
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
@@ -104,7 +104,7 @@ spec:
104104
metadata: {}
105105
spec:
106106
bootstrap:
107-
dataSecretName: ""
107+
dataSecretName: "unused"
108108
clusterName: "${CLUSTER_NAME}"
109109
infrastructureRef:
110110
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1

‎templates/flavors/aks/cluster-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
metadata: {}
5959
spec:
6060
bootstrap:
61-
dataSecretName: ""
61+
dataSecretName: "unused"
6262
clusterName: "${CLUSTER_NAME}"
6363
infrastructureRef:
6464
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -89,7 +89,7 @@ spec:
8989
metadata: {}
9090
spec:
9191
bootstrap:
92-
dataSecretName: ""
92+
dataSecretName: "unused"
9393
clusterName: "${CLUSTER_NAME}"
9494
infrastructureRef:
9595
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎templates/test/ci/cluster-template-prow-aks-aso.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-aks.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
metadata: {}
1010
spec:
1111
bootstrap:
12-
dataSecretName: ""
12+
dataSecretName: "unused"
1313
clusterName: "${CLUSTER_NAME}"
1414
infrastructureRef:
1515
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1

‎templates/test/ci/prow-aks/patches/aks-pool2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
metadata: {}
1111
spec:
1212
bootstrap:
13-
dataSecretName: ""
13+
dataSecretName: "unused"
1414
clusterName: "${CLUSTER_NAME}"
1515
infrastructureRef:
1616
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎test/e2e/aks_public_ip_prefix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func AKSPublicIPPrefixSpec(ctx context.Context, inputGetter func() AKSPublicIPPr
113113
Template: clusterv1.MachineTemplateSpec{
114114
Spec: clusterv1.MachineSpec{
115115
Bootstrap: clusterv1.Bootstrap{
116-
DataSecretName: ptr.To(""),
116+
DataSecretName: ptr.To("unused"),
117117
},
118118
ClusterName: input.Cluster.Name,
119119
InfrastructureRef: corev1.ObjectReference{

‎test/e2e/aks_spot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func AKSSpotSpec(ctx context.Context, inputGetter func() AKSSpotSpecInput) {
9191
Template: clusterv1.MachineTemplateSpec{
9292
Spec: clusterv1.MachineSpec{
9393
Bootstrap: clusterv1.Bootstrap{
94-
DataSecretName: ptr.To(""),
94+
DataSecretName: ptr.To("unused"),
9595
},
9696
ClusterName: input.Cluster.Name,
9797
InfrastructureRef: corev1.ObjectReference{

0 commit comments

Comments
 (0)