Skip to content

Commit 5b9ebd8

Browse files
serngawyserngawy
committed
Fix update channel group
Signed-off-by: serngawy <[email protected]>
1 parent 4df1908 commit 5b9ebd8

File tree

4 files changed

+48
-19
lines changed

4 files changed

+48
-19
lines changed

‎controlplane/rosa/controllers/rosacontrolplane_controller.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,11 @@ func (r *ROSAControlPlaneReconciler) updateOCMClusterSpec(rosaControlPlane *rosa
565565
updated = true
566566
}
567567

568-
// TODO: check for cluster AutoScale changes
569-
// rosaControlPlane.Spec.DefaultMachinePoolSpec.Autoscaling
568+
channelGroup := string(rosaControlPlane.Spec.ChannelGroup)
569+
if ocmClusterSpec.ChannelGroup != channelGroup {
570+
ocmClusterSpec.ChannelGroup = channelGroup
571+
updated = true
572+
}
570573

571574
return ocmClusterSpec, updated
572575
}

‎controlplane/rosa/controllers/rosacontrolplane_controller_test.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,30 @@ func TestUpdateOCMClusterSpec(t *testing.T) {
179179
g.Expect(updated).To(BeTrue())
180180
g.Expect(ocmSpec).To(Equal(expectedOCMSpec))
181181
})
182+
183+
// Test case 6: channel group update
184+
t.Run("Update AllowedRegistriesForImport", func(t *testing.T) {
185+
rosaControlPlane := &rosacontrolplanev1.ROSAControlPlane{
186+
Spec: rosacontrolplanev1.RosaControlPlaneSpec{
187+
ChannelGroup: rosacontrolplanev1.Candidate,
188+
},
189+
}
190+
191+
mockCluster, _ := v1.NewCluster().
192+
Version(v1.NewVersion().
193+
ChannelGroup("stable")).
194+
Build()
195+
196+
expectedOCMSpec := ocm.Spec{
197+
ChannelGroup: "candidate",
198+
}
199+
200+
reconciler := &ROSAControlPlaneReconciler{}
201+
ocmSpec, updated := reconciler.updateOCMClusterSpec(rosaControlPlane, mockCluster)
202+
203+
g.Expect(updated).To(BeTrue())
204+
g.Expect(ocmSpec).To(Equal(expectedOCMSpec))
205+
})
182206
}
183207

184208
func TestRosaControlPlaneReconcileStatusVersion(t *testing.T) {

‎go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module sigs.k8s.io/cluster-api-provider-aws/v2
22

3-
go 1.23.0
3+
go 1.23.1
4+
5+
toolchain go1.24.2
46

57
require (
68
github.com/alessio/shellescape v1.4.2
@@ -35,9 +37,9 @@ require (
3537
github.com/google/gofuzz v1.2.0
3638
github.com/onsi/ginkgo/v2 v2.23.3
3739
github.com/onsi/gomega v1.36.3
38-
github.com/openshift-online/ocm-common v0.0.12
39-
github.com/openshift-online/ocm-sdk-go v0.1.447
40-
github.com/openshift/rosa v1.2.48-rc1
40+
github.com/openshift-online/ocm-common v0.0.29
41+
github.com/openshift-online/ocm-sdk-go v0.1.465
42+
github.com/openshift/rosa v1.2.55
4143
github.com/pkg/errors v0.9.1
4244
github.com/prometheus/client_golang v1.19.1
4345
github.com/sergi/go-diff v1.3.1
@@ -213,7 +215,7 @@ require (
213215
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
214216
go.opentelemetry.io/otel/trace v1.29.0 // indirect
215217
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
216-
go.uber.org/mock v0.3.0 // indirect
218+
go.uber.org/mock v0.5.2 // indirect
217219
go.uber.org/multierr v1.11.0 // indirect
218220
go.uber.org/zap v1.27.0 // indirect
219221
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
312312
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
313313
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
314314
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
315-
github.com/itchyny/gojq v0.12.7 h1:hYPTpeWfrJ1OT+2j6cvBScbhl0TkdwGM4bc66onUSOQ=
316-
github.com/itchyny/gojq v0.12.7/go.mod h1:ZdvNHVlzPgUf8pgjnuDTmGfHA/21KoutQUJ3An/xNuw=
317-
github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921iRkU=
318-
github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A=
315+
github.com/itchyny/gojq v0.12.9 h1:biKpbKwMxVYhCU1d6mR7qMr3f0Hn9F5k5YykCVb3gmM=
316+
github.com/itchyny/gojq v0.12.9/go.mod h1:T4Ip7AETUXeGpD+436m+UEl3m3tokRgajd5pRfsR5oE=
317+
github.com/itchyny/timefmt-go v0.1.4 h1:hFEfWVdwsEi+CY8xY2FtgWHGQaBaC3JeHd+cve0ynVM=
318+
github.com/itchyny/timefmt-go v0.1.4/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
319319
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
320320
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
321321
github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
@@ -419,12 +419,12 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
419419
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
420420
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
421421
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
422-
github.com/openshift-online/ocm-common v0.0.12 h1:2oGZCXd8O/nZVlM0pvTtm3hDGbW/ncTtvSLLB+nuQf0=
423-
github.com/openshift-online/ocm-common v0.0.12/go.mod h1:6MWje2NFNJ3IWpGs7BYj6DWagWXHyp8EnmYY7XFTtI4=
424-
github.com/openshift-online/ocm-sdk-go v0.1.447 h1:PLau6NVgTpwL+L5OcKrBZm+HbET34tjHbENd2GsFhRw=
425-
github.com/openshift-online/ocm-sdk-go v0.1.447/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y=
426-
github.com/openshift/rosa v1.2.48-rc1 h1:lmggIjrEQ5BgMVZbL3P/nFKUgxdxkdY5z6Zj3GrUl9M=
427-
github.com/openshift/rosa v1.2.48-rc1/go.mod h1:lZaAjhCj+8oklBODolna8G0dqjlISq5+djzyfcx5gG0=
422+
github.com/openshift-online/ocm-common v0.0.29 h1:EyKoLvQXKOa3UpoWHT3cMyNHBbhSZURC8Ws/cxTaT1U=
423+
github.com/openshift-online/ocm-common v0.0.29/go.mod h1:VEkuZp9aqbXtetZ5ycND6QpvhykvTuBF3oPsVM1X3vI=
424+
github.com/openshift-online/ocm-sdk-go v0.1.465 h1:RZr92sdcAKyLVcL19/RYOn6KVtspDUH1wc3UuO4LgiE=
425+
github.com/openshift-online/ocm-sdk-go v0.1.465/go.mod h1:EOkylgH0bafd+SlU9YvMrIIxHJw0Hk1EnC7W1VZeW8I=
426+
github.com/openshift/rosa v1.2.55 h1:Y6UD1474aExF4bZSh2KH4zE+Xl2NVsiuj3TLQGT9U+Y=
427+
github.com/openshift/rosa v1.2.55/go.mod h1:EE0yTEjbwxfnH/9YbQZaUXUVbIzfPa9KCRNw19QdLsw=
428428
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
429429
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
430430
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
@@ -561,8 +561,8 @@ go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeX
561561
go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
562562
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
563563
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
564-
go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
565-
go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
564+
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
565+
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
566566
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
567567
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
568568
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=

0 commit comments

Comments
 (0)