Skip to content

Commit db9a379

Browse files
rancher-pr-and-push-webhook[bot]tomleb
rancher-pr-and-push-webhook[bot]
and
tomleb
authored
[main] Sync webhook dependencies (#973)
* Sync dependencies * Rename RKEClusterSpecCommon to ClusterConfiguration --------- Co-authored-by: rancher-pr-and-push-webhook[bot] <181785884+rancher-pr-and-push-webhook[bot]@users.noreply.github.com> Co-authored-by: Tom Lebreux <[email protected]>
1 parent 3b529c1 commit db9a379

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/rancher/dynamiclistener v0.7.0
4646
github.com/rancher/jsonpath v0.0.0-20250620213443-ad24535cf0c1
4747
github.com/rancher/lasso v0.2.3
48-
github.com/rancher/rancher/pkg/apis v0.0.0-20250628053911-e6fa86c1c800
48+
github.com/rancher/rancher/pkg/apis v0.0.0-20250716114904-c21d17df9d34
4949
github.com/rancher/rke v1.8.0-rc.4
5050
github.com/rancher/wrangler/v3 v3.2.2
5151
github.com/robfig/cron v1.2.0
@@ -97,10 +97,10 @@ require (
9797
github.com/prometheus/client_model v0.6.1 // indirect
9898
github.com/prometheus/common v0.62.0 // indirect
9999
github.com/prometheus/procfs v0.15.1 // indirect
100-
github.com/rancher/aks-operator v1.12.0-rc.1 // indirect
101-
github.com/rancher/eks-operator v1.12.0-rc.1 // indirect
102-
github.com/rancher/fleet/pkg/apis v0.13.0-alpha.5 // indirect
103-
github.com/rancher/gke-operator v1.12.0-rc.1 // indirect
100+
github.com/rancher/aks-operator v1.12.0-rc.2 // indirect
101+
github.com/rancher/eks-operator v1.12.0-rc.2 // indirect
102+
github.com/rancher/fleet/pkg/apis v0.13.0-beta.2 // indirect
103+
github.com/rancher/gke-operator v1.12.0-rc.2 // indirect
104104
github.com/rancher/norman v0.6.1 // indirect
105105
github.com/spf13/pflag v1.0.6 // indirect
106106
github.com/x448/float16 v0.8.4 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,24 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ
120120
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
121121
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
122122
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
123-
github.com/rancher/aks-operator v1.12.0-rc.1 h1:alkHjxk9UZPMLY7QsPQjAom8kFuULRSsxhoCSOOgaAM=
124-
github.com/rancher/aks-operator v1.12.0-rc.1/go.mod h1:GjhvVWuvJTQAmiRM+7XeSIu+9uMrMxu8MzuoxTbxQe8=
123+
github.com/rancher/aks-operator v1.12.0-rc.2 h1:eXaVLvtuYVEVqqWhqwAmblsX/iWCCCc6kvTsdyCZuB4=
124+
github.com/rancher/aks-operator v1.12.0-rc.2/go.mod h1:dxEx37/oNuK/Z8Xbf3SeIi6qGb/gJr9TqZajf6aNLdo=
125125
github.com/rancher/dynamiclistener v0.7.0 h1:+jyfZ4lVamc1UbKWo8V8dhSPtCgRZYaY8nm7wiHeko4=
126126
github.com/rancher/dynamiclistener v0.7.0/go.mod h1:Q2YA42xp7Xc69JiSlJ8GpvLvze261T0iQ/TP4RdMCYk=
127-
github.com/rancher/eks-operator v1.12.0-rc.1 h1:xQ9rMqz+T3UOrGsUnjr3j49SRfEM1FJJ+DDCDb7h5II=
128-
github.com/rancher/eks-operator v1.12.0-rc.1/go.mod h1:w7ZzRD/Hhxqltlz7XWAgvviYWhmXpwwB7mfTPOZu99E=
129-
github.com/rancher/fleet/pkg/apis v0.13.0-alpha.5 h1:mSMSgEOaf3vPEFJ0/F/IC1XX+Dda56PebVuafZcR+Yo=
130-
github.com/rancher/fleet/pkg/apis v0.13.0-alpha.5/go.mod h1:Qvt5nNrVgwboBZJy3dMNcVC9fncUFKaVPpbj+LdeYEs=
131-
github.com/rancher/gke-operator v1.12.0-rc.1 h1:fMk5S4cvRfZvreaSz/NM9iWewWI8QIOoYI4L0ZHakyo=
132-
github.com/rancher/gke-operator v1.12.0-rc.1/go.mod h1:O1/6RFU05XW6vOEJ0a7xvboBSy5X6EE8DZqzikMK9tg=
127+
github.com/rancher/eks-operator v1.12.0-rc.2 h1:VLLdl/lnfE+mu8/2t9mk0TZPvsS8OXZIcG8FCgkzR7A=
128+
github.com/rancher/eks-operator v1.12.0-rc.2/go.mod h1:TxUIyEGS9wSiMSFSaamkyo3jLnM3XE4MbIpdmBguBP0=
129+
github.com/rancher/fleet/pkg/apis v0.13.0-beta.2 h1:uBLX8Ve5zugS+H2OmDouyEw9/HWCUN05UXwgWPILYnk=
130+
github.com/rancher/fleet/pkg/apis v0.13.0-beta.2/go.mod h1:Qvt5nNrVgwboBZJy3dMNcVC9fncUFKaVPpbj+LdeYEs=
131+
github.com/rancher/gke-operator v1.12.0-rc.2 h1:WebIBSGxd004qLNXRjdTIb+GAi44cpo0mvRysyXr4XE=
132+
github.com/rancher/gke-operator v1.12.0-rc.2/go.mod h1:cc8fFSBsy9teeCXeSD8RpUbjgdEaBoYb0JL3Mmdr/gY=
133133
github.com/rancher/jsonpath v0.0.0-20250620213443-ad24535cf0c1 h1:vRtxuvIF0UarXIAwGYNwSFoRYJadVnOrD8kx2qrZyN8=
134134
github.com/rancher/jsonpath v0.0.0-20250620213443-ad24535cf0c1/go.mod h1:xavYr3cNyyAeA72nMVB60+q/EJ8Anu+loQWFJyXOeP8=
135135
github.com/rancher/lasso v0.2.3 h1:74/z/C/O3ykhyMrRuEgc9kVyYiSoS7kp5BAijlcyXDg=
136136
github.com/rancher/lasso v0.2.3/go.mod h1:G+KeeOaKRjp+qGp0bV6VbLhYrq1vHbJPbDh40ejg5yE=
137137
github.com/rancher/norman v0.6.1 h1:JVIxkWZcbxtrcSK4WIwsmyB07TzTvoqqf/R0fZB7ylk=
138138
github.com/rancher/norman v0.6.1/go.mod h1:jRcnEruyY6olqtImy+q+zw0/iXX7YqLF4/K4kh5hR40=
139-
github.com/rancher/rancher/pkg/apis v0.0.0-20250628053911-e6fa86c1c800 h1:X6b36q0MT30IaO4TPEuNOq1AcqF/Vr1Qi+Es7MRA4/Q=
140-
github.com/rancher/rancher/pkg/apis v0.0.0-20250628053911-e6fa86c1c800/go.mod h1:OCn4rNvTXZ3mki8aaZorlIz8UukEq5gRqphXxt9G3I8=
139+
github.com/rancher/rancher/pkg/apis v0.0.0-20250716114904-c21d17df9d34 h1:hmirXCtJQgTEjf9ygZVWMsvrP4r0WGS4vGd592feyss=
140+
github.com/rancher/rancher/pkg/apis v0.0.0-20250716114904-c21d17df9d34/go.mod h1:dvldUW8NhiL9JWjON/IgSTxv2kPy3snG+6uPdJtLLXk=
141141
github.com/rancher/rke v1.7.2 h1:+2fcl0gCjRHzf1ev9C9ptQ1pjYbDngC1Qv8V/0ki/dk=
142142
github.com/rancher/rke v1.7.2/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A=
143143
github.com/rancher/wrangler/v3 v3.2.2 h1:IK1/v8n8gaZSB4izmJhGFXJt38Z8gkbwzl3Lo/e2jQc=

‎pkg/resources/provisioning.cattle.io/v1/cluster/mutator_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func Test_SetKubeAPIServerArgs(t *testing.T) {
107107
cluster: &v1.Cluster{
108108
Spec: v1.ClusterSpec{
109109
RKEConfig: &v1.RKEConfig{
110-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
110+
ClusterConfiguration: rkev1.ClusterConfiguration{
111111
UpgradeStrategy: rkev1.ClusterUpgradeStrategy{},
112112
ChartValues: rkev1.GenericMap{},
113113
MachineGlobalConfig: rkev1.GenericMap{
@@ -143,7 +143,7 @@ func Test_SetKubeAPIServerArgs(t *testing.T) {
143143
cluster: &v1.Cluster{
144144
Spec: v1.ClusterSpec{
145145
RKEConfig: &v1.RKEConfig{
146-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
146+
ClusterConfiguration: rkev1.ClusterConfiguration{
147147
UpgradeStrategy: rkev1.ClusterUpgradeStrategy{},
148148
ChartValues: rkev1.GenericMap{},
149149
MachineGlobalConfig: rkev1.GenericMap{
@@ -441,7 +441,7 @@ func clusterWithoutKubeAPIServerArg() *v1.Cluster {
441441
return &v1.Cluster{
442442
Spec: v1.ClusterSpec{
443443
RKEConfig: &v1.RKEConfig{
444-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
444+
ClusterConfiguration: rkev1.ClusterConfiguration{
445445
UpgradeStrategy: rkev1.ClusterUpgradeStrategy{},
446446
ChartValues: rkev1.GenericMap{},
447447
MachineGlobalConfig: rkev1.GenericMap{
@@ -555,7 +555,7 @@ func clusterWithMachineSelectorFile1() *v1.Cluster {
555555
return &v1.Cluster{
556556
Spec: v1.ClusterSpec{
557557
RKEConfig: &v1.RKEConfig{
558-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
558+
ClusterConfiguration: rkev1.ClusterConfiguration{
559559
MachineSelectorFiles: []rkev1.RKEProvisioningFiles{
560560
machineSelectorFile1(),
561561
},
@@ -569,7 +569,7 @@ func clusterWithMachineSelectorFile1And2And3() *v1.Cluster {
569569
return &v1.Cluster{
570570
Spec: v1.ClusterSpec{
571571
RKEConfig: &v1.RKEConfig{
572-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
572+
ClusterConfiguration: rkev1.ClusterConfiguration{
573573
MachineSelectorFiles: []rkev1.RKEProvisioningFiles{
574574
machineSelectorFile1(),
575575
machineSelectorFile2(),
@@ -585,7 +585,7 @@ func clusterWithMachineSelectorFile2And3() *v1.Cluster {
585585
return &v1.Cluster{
586586
Spec: v1.ClusterSpec{
587587
RKEConfig: &v1.RKEConfig{
588-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
588+
ClusterConfiguration: rkev1.ClusterConfiguration{
589589
MachineSelectorFiles: []rkev1.RKEProvisioningFiles{
590590
machineSelectorFile2(),
591591
machineSelectorFile3(),
@@ -600,7 +600,7 @@ func clusterWithMachineSelectorFile1And2() *v1.Cluster {
600600
return &v1.Cluster{
601601
Spec: v1.ClusterSpec{
602602
RKEConfig: &v1.RKEConfig{
603-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
603+
ClusterConfiguration: rkev1.ClusterConfiguration{
604604
MachineSelectorFiles: []rkev1.RKEProvisioningFiles{
605605
machineSelectorFile1(),
606606
machineSelectorFile2(),
@@ -615,7 +615,7 @@ func clusterWithMachineSelectorFile2() *v1.Cluster {
615615
return &v1.Cluster{
616616
Spec: v1.ClusterSpec{
617617
RKEConfig: &v1.RKEConfig{
618-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
618+
ClusterConfiguration: rkev1.ClusterConfiguration{
619619
MachineSelectorFiles: []rkev1.RKEProvisioningFiles{
620620
machineSelectorFile2(),
621621
},
@@ -629,7 +629,7 @@ func clusterWithoutMachineSelectorFile() *v1.Cluster {
629629
return &v1.Cluster{
630630
Spec: v1.ClusterSpec{
631631
RKEConfig: &v1.RKEConfig{
632-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{},
632+
ClusterConfiguration: rkev1.ClusterConfiguration{},
633633
},
634634
},
635635
}

‎pkg/resources/provisioning.cattle.io/v1/cluster/validator_test.go‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
598598
cluster: &v1.Cluster{
599599
Spec: v1.ClusterSpec{
600600
RKEConfig: &v1.RKEConfig{
601-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
601+
ClusterConfiguration: rkev1.ClusterConfiguration{
602602
DataDirectories: rkev1.DataDirectories{
603603
SystemAgent: "a",
604604
},
@@ -609,7 +609,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
609609
oldCluster: &v1.Cluster{
610610
Spec: v1.ClusterSpec{
611611
RKEConfig: &v1.RKEConfig{
612-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
612+
ClusterConfiguration: rkev1.ClusterConfiguration{
613613
DataDirectories: rkev1.DataDirectories{
614614
SystemAgent: "a",
615615
},
@@ -624,7 +624,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
624624
cluster: &v1.Cluster{
625625
Spec: v1.ClusterSpec{
626626
RKEConfig: &v1.RKEConfig{
627-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
627+
ClusterConfiguration: rkev1.ClusterConfiguration{
628628
DataDirectories: rkev1.DataDirectories{
629629
SystemAgent: "a",
630630
},
@@ -635,7 +635,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
635635
oldCluster: &v1.Cluster{
636636
Spec: v1.ClusterSpec{
637637
RKEConfig: &v1.RKEConfig{
638-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
638+
ClusterConfiguration: rkev1.ClusterConfiguration{
639639
DataDirectories: rkev1.DataDirectories{
640640
SystemAgent: "b",
641641
},
@@ -670,7 +670,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
670670
cluster: &v1.Cluster{
671671
Spec: v1.ClusterSpec{
672672
RKEConfig: &v1.RKEConfig{
673-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
673+
ClusterConfiguration: rkev1.ClusterConfiguration{
674674
DataDirectories: rkev1.DataDirectories{
675675
SystemAgent: "a",
676676
},
@@ -696,7 +696,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
696696
cluster: &v1.Cluster{
697697
Spec: v1.ClusterSpec{
698698
RKEConfig: &v1.RKEConfig{
699-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
699+
ClusterConfiguration: rkev1.ClusterConfiguration{
700700
DataDirectories: rkev1.DataDirectories{
701701
SystemAgent: "b",
702702
},
@@ -733,7 +733,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
733733
oldCluster: &v1.Cluster{
734734
Spec: v1.ClusterSpec{
735735
RKEConfig: &v1.RKEConfig{
736-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
736+
ClusterConfiguration: rkev1.ClusterConfiguration{
737737
DataDirectories: rkev1.DataDirectories{
738738
SystemAgent: "a",
739739
},
@@ -775,7 +775,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
775775
oldCluster: &v1.Cluster{
776776
Spec: v1.ClusterSpec{
777777
RKEConfig: &v1.RKEConfig{
778-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
778+
ClusterConfiguration: rkev1.ClusterConfiguration{
779779
DataDirectories: rkev1.DataDirectories{
780780
SystemAgent: "a",
781781
},
@@ -811,7 +811,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
811811
cluster: &v1.Cluster{
812812
Spec: v1.ClusterSpec{
813813
RKEConfig: &v1.RKEConfig{
814-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
814+
ClusterConfiguration: rkev1.ClusterConfiguration{
815815
DataDirectories: rkev1.DataDirectories{
816816
SystemAgent: "a",
817817
},
@@ -832,7 +832,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
832832
cluster: &v1.Cluster{
833833
Spec: v1.ClusterSpec{
834834
RKEConfig: &v1.RKEConfig{
835-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
835+
ClusterConfiguration: rkev1.ClusterConfiguration{
836836
DataDirectories: rkev1.DataDirectories{
837837
SystemAgent: "a",
838838
},
@@ -849,7 +849,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
849849
oldCluster: &v1.Cluster{
850850
Spec: v1.ClusterSpec{
851851
RKEConfig: &v1.RKEConfig{
852-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
852+
ClusterConfiguration: rkev1.ClusterConfiguration{
853853
DataDirectories: rkev1.DataDirectories{
854854
SystemAgent: "a",
855855
},
@@ -864,7 +864,7 @@ func TestValidateSystemAgentDataDirectory(t *testing.T) {
864864
cluster: &v1.Cluster{
865865
Spec: v1.ClusterSpec{
866866
RKEConfig: &v1.RKEConfig{
867-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
867+
ClusterConfiguration: rkev1.ClusterConfiguration{
868868
DataDirectories: rkev1.DataDirectories{
869869
SystemAgent: "a",
870870
},
@@ -981,7 +981,7 @@ func TestValidateDataDirectories(t *testing.T) {
981981
cluster: &v1.Cluster{
982982
Spec: v1.ClusterSpec{
983983
RKEConfig: &v1.RKEConfig{
984-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
984+
ClusterConfiguration: rkev1.ClusterConfiguration{
985985
DataDirectories: rkev1.DataDirectories{
986986
K8sDistro: "a",
987987
},
@@ -997,7 +997,7 @@ func TestValidateDataDirectories(t *testing.T) {
997997
cluster: &v1.Cluster{
998998
Spec: v1.ClusterSpec{
999999
RKEConfig: &v1.RKEConfig{
1000-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1000+
ClusterConfiguration: rkev1.ClusterConfiguration{
10011001
DataDirectories: rkev1.DataDirectories{
10021002
Provisioning: "a",
10031003
},
@@ -1013,7 +1013,7 @@ func TestValidateDataDirectories(t *testing.T) {
10131013
cluster: &v1.Cluster{
10141014
Spec: v1.ClusterSpec{
10151015
RKEConfig: &v1.RKEConfig{
1016-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1016+
ClusterConfiguration: rkev1.ClusterConfiguration{
10171017
DataDirectories: rkev1.DataDirectories{
10181018
SystemAgent: "a",
10191019
},
@@ -1029,7 +1029,7 @@ func TestValidateDataDirectories(t *testing.T) {
10291029
cluster: &v1.Cluster{
10301030
Spec: v1.ClusterSpec{
10311031
RKEConfig: &v1.RKEConfig{
1032-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1032+
ClusterConfiguration: rkev1.ClusterConfiguration{
10331033
DataDirectories: rkev1.DataDirectories{
10341034
K8sDistro: "/a",
10351035
Provisioning: "/a",
@@ -1046,7 +1046,7 @@ func TestValidateDataDirectories(t *testing.T) {
10461046
cluster: &v1.Cluster{
10471047
Spec: v1.ClusterSpec{
10481048
RKEConfig: &v1.RKEConfig{
1049-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1049+
ClusterConfiguration: rkev1.ClusterConfiguration{
10501050
DataDirectories: rkev1.DataDirectories{
10511051
K8sDistro: "/a",
10521052
SystemAgent: "/a",
@@ -1063,7 +1063,7 @@ func TestValidateDataDirectories(t *testing.T) {
10631063
cluster: &v1.Cluster{
10641064
Spec: v1.ClusterSpec{
10651065
RKEConfig: &v1.RKEConfig{
1066-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1066+
ClusterConfiguration: rkev1.ClusterConfiguration{
10671067
DataDirectories: rkev1.DataDirectories{
10681068
Provisioning: "/a",
10691069
SystemAgent: "/a",
@@ -1080,7 +1080,7 @@ func TestValidateDataDirectories(t *testing.T) {
10801080
cluster: &v1.Cluster{
10811081
Spec: v1.ClusterSpec{
10821082
RKEConfig: &v1.RKEConfig{
1083-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1083+
ClusterConfiguration: rkev1.ClusterConfiguration{
10841084
DataDirectories: rkev1.DataDirectories{
10851085
K8sDistro: "/a",
10861086
Provisioning: "/a/b",
@@ -1097,7 +1097,7 @@ func TestValidateDataDirectories(t *testing.T) {
10971097
cluster: &v1.Cluster{
10981098
Spec: v1.ClusterSpec{
10991099
RKEConfig: &v1.RKEConfig{
1100-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1100+
ClusterConfiguration: rkev1.ClusterConfiguration{
11011101
DataDirectories: rkev1.DataDirectories{
11021102
K8sDistro: "/a/b",
11031103
Provisioning: "/a",
@@ -1209,7 +1209,7 @@ func TestValidateDataDirectories(t *testing.T) {
12091209
cluster: &v1.Cluster{
12101210
Spec: v1.ClusterSpec{
12111211
RKEConfig: &v1.RKEConfig{
1212-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1212+
ClusterConfiguration: rkev1.ClusterConfiguration{
12131213
DataDirectories: rkev1.DataDirectories{
12141214
SystemAgent: "/a",
12151215
},
@@ -1236,7 +1236,7 @@ func TestValidateDataDirectories(t *testing.T) {
12361236
cluster: &v1.Cluster{
12371237
Spec: v1.ClusterSpec{
12381238
RKEConfig: &v1.RKEConfig{
1239-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1239+
ClusterConfiguration: rkev1.ClusterConfiguration{
12401240
DataDirectories: rkev1.DataDirectories{
12411241
SystemAgent: "/a",
12421242
},
@@ -1247,7 +1247,7 @@ func TestValidateDataDirectories(t *testing.T) {
12471247
oldCluster: &v1.Cluster{
12481248
Spec: v1.ClusterSpec{
12491249
RKEConfig: &v1.RKEConfig{
1250-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1250+
ClusterConfiguration: rkev1.ClusterConfiguration{
12511251
DataDirectories: rkev1.DataDirectories{
12521252
SystemAgent: "/b",
12531253
},
@@ -1263,7 +1263,7 @@ func TestValidateDataDirectories(t *testing.T) {
12631263
cluster: &v1.Cluster{
12641264
Spec: v1.ClusterSpec{
12651265
RKEConfig: &v1.RKEConfig{
1266-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1266+
ClusterConfiguration: rkev1.ClusterConfiguration{
12671267
DataDirectories: rkev1.DataDirectories{
12681268
Provisioning: "/a",
12691269
},
@@ -1274,7 +1274,7 @@ func TestValidateDataDirectories(t *testing.T) {
12741274
oldCluster: &v1.Cluster{
12751275
Spec: v1.ClusterSpec{
12761276
RKEConfig: &v1.RKEConfig{
1277-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1277+
ClusterConfiguration: rkev1.ClusterConfiguration{
12781278
DataDirectories: rkev1.DataDirectories{
12791279
Provisioning: "/b",
12801280
},
@@ -1290,7 +1290,7 @@ func TestValidateDataDirectories(t *testing.T) {
12901290
cluster: &v1.Cluster{
12911291
Spec: v1.ClusterSpec{
12921292
RKEConfig: &v1.RKEConfig{
1293-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1293+
ClusterConfiguration: rkev1.ClusterConfiguration{
12941294
DataDirectories: rkev1.DataDirectories{
12951295
K8sDistro: "/a",
12961296
},
@@ -1301,7 +1301,7 @@ func TestValidateDataDirectories(t *testing.T) {
13011301
oldCluster: &v1.Cluster{
13021302
Spec: v1.ClusterSpec{
13031303
RKEConfig: &v1.RKEConfig{
1304-
RKEClusterSpecCommon: rkev1.RKEClusterSpecCommon{
1304+
ClusterConfiguration: rkev1.ClusterConfiguration{
13051305
DataDirectories: rkev1.DataDirectories{
13061306
K8sDistro: "/b",
13071307
},

0 commit comments

Comments
 (0)