From 6ba80418f63182caddd94bb318a46ba35edcea63 Mon Sep 17 00:00:00 2001 From: Shyam Radhakrishnan Date: Fri, 18 Aug 2023 13:13:05 +0530 Subject: [PATCH 1/2] USe generate name so that conflicts do not arise in case of multiple clusters --- cloud/util/util.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud/util/util.go b/cloud/util/util.go index f3a73b1c..c574cff5 100644 --- a/cloud/util/util.go +++ b/cloud/util/util.go @@ -320,10 +320,10 @@ func CreateMachinePoolMachinesIfNotExists(ctx context.Context, params MachinePar } infraMachine := &infrav2exp.OCIMachinePoolMachine{ ObjectMeta: metav1.ObjectMeta{ - Namespace: params.Namespace, - Name: specMachine.Name, - Labels: labels, - Annotations: make(map[string]string), + Namespace: params.Namespace, + GenerateName: params.MachinePool.Name, + Labels: labels, + Annotations: make(map[string]string), // set the parent to infra machinepool till the capi machine reconciler changes it to capi machinepool machine OwnerReferences: []metav1.OwnerReference{ { From 48ddc15fe76955fa21f2af1235c127bf3d30edac Mon Sep 17 00:00:00 2001 From: Shyam Radhakrishnan Date: Fri, 18 Aug 2023 17:24:15 +0530 Subject: [PATCH 2/2] Use generate name so that conflicts do not arise in case of multiple clusters --- metadata.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metadata.yaml b/metadata.yaml index d109a7cd..cbc340fe 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -44,3 +44,6 @@ releaseSeries: - major: 0 minor: 13 contract: v1beta1 + - major: 0 + minor: 14 + contract: v1beta1 \ No newline at end of file