Skip to content

Commit a16d438

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #758 from furkatgofurov7/bump-capi-v1.10beta0
🌱 Bump CAPI to v1.10.0-beta.0
2 parents 4d2ffe2 + 675345e commit a16d438

19 files changed

Lines changed: 636 additions & 506 deletions

‎cmd/plugin/cmd/preload.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var loadCmd = &cobra.Command{
6666
6767
Alternatively, for multi-provider OCI artifact, a fully specified name can be used for both metadata and components:
6868
69-
oras push ttl.sh/infrastructure-provider:tag infrastructure-docker-v1.9.5-metadata.yaml infrastructure-docker-v1.9.5-components.yaml
69+
oras push ttl.sh/infrastructure-provider:tag infrastructure-docker-v1.10.0-beta.0-metadata.yaml infrastructure-docker-v1.10.0-beta.0-components.yaml
7070
`),
7171
Example: Examples(`
7272
# Load CAPI operator manifests from OCI source

‎cmd/plugin/cmd/preload_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ func TestPreloadCommand(t *testing.T) {
6464
publishOpts: &publishOptions{
6565
ociUrl: "ttl.sh/cluster-api-operator-manifests:1m",
6666
providers: []publishProvider{{
67-
configMapName: "core-cluster-api-v1.9.5",
68-
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.5", "", ""),
67+
configMapName: "core-cluster-api-v1.10.0-beta.0",
68+
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.10.0-beta.0", "", ""),
6969
metadataKey: "metadata.yaml",
7070
metadataData: []byte("metadata"),
7171
componentsKey: "components.yaml",
@@ -79,18 +79,18 @@ func TestPreloadCommand(t *testing.T) {
7979
publishOpts: &publishOptions{
8080
ociUrl: "ttl.sh/cluster-api-operator-manifests:1m",
8181
providers: []publishProvider{{
82-
configMapName: "core-cluster-api-v1.9.5",
83-
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.5", "", ""),
84-
metadataKey: "core-cluster-api-v1.9.5-metadata.yaml",
82+
configMapName: "core-cluster-api-v1.10.0-beta.0",
83+
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.10.0-beta.0", "", ""),
84+
metadataKey: "core-cluster-api-v1.10.0-beta.0-metadata.yaml",
8585
metadataData: []byte("metadata"),
86-
componentsKey: "core-cluster-api-v1.9.5-components.yaml",
86+
componentsKey: "core-cluster-api-v1.10.0-beta.0-components.yaml",
8787
componentsData: []byte("components"),
8888
}, {
89-
configMapName: "infrastructure-docker-v1.9.5",
90-
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", ""),
91-
metadataKey: "infrastructure-docker-v1.9.5-metadata.yaml",
89+
configMapName: "infrastructure-docker-v1.10.0-beta.0",
90+
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.10.0-beta.0", "", ""),
91+
metadataKey: "infrastructure-docker-v1.10.0-beta.0-metadata.yaml",
9292
metadataData: []byte("metadata"),
93-
componentsKey: "infrastructure-docker-v1.9.5-components.yaml",
93+
componentsKey: "infrastructure-docker-v1.10.0-beta.0-components.yaml",
9494
componentsData: []byte("components"),
9595
}},
9696
},
@@ -100,7 +100,7 @@ func TestPreloadCommand(t *testing.T) {
100100
name: "custom url infra provider",
101101
existingProviders: []genericprovider.GenericProvider{
102102
func() genericprovider.GenericProvider {
103-
p := generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", "")
103+
p := generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.10.0-beta.0", "", "")
104104
spec := p.GetSpec()
105105
spec.FetchConfig = &operatorv1.FetchConfiguration{
106106
URL: "https://github.com/kubernetes-sigs/cluster-api/releases/latest/core-components.yaml",
@@ -115,8 +115,8 @@ func TestPreloadCommand(t *testing.T) {
115115
{
116116
name: "regular core and infra provider",
117117
existingProviders: []genericprovider.GenericProvider{
118-
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.5", "", ""),
119-
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", ""),
118+
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.10.0-beta.0", "", ""),
119+
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.10.0-beta.0", "", ""),
120120
},
121121
expectedConfigMaps: 2,
122122
},
@@ -125,8 +125,8 @@ func TestPreloadCommand(t *testing.T) {
125125
publishOpts: &publishOptions{
126126
ociUrl: "ttl.sh/cluster-api-operator-manifests:1m",
127127
providers: []publishProvider{{
128-
configMapName: "core-cluster-api-v1.9.5",
129-
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "metadata-missing", "default", "v1.9.5", "", ""),
128+
configMapName: "core-cluster-api-v1.10.0-beta.0",
129+
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "metadata-missing", "default", "v1.10.0-beta.0", "", ""),
130130
metadataKey: "incorrect-metadata.yaml",
131131
metadataData: []byte("test"),
132132
componentsKey: "components.yaml",
@@ -140,8 +140,8 @@ func TestPreloadCommand(t *testing.T) {
140140
publishOpts: &publishOptions{
141141
ociUrl: "ttl.sh/cluster-api-operator-manifests:1m",
142142
providers: []publishProvider{{
143-
configMapName: "core-cluster-api-v1.9.5",
144-
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "components-missing", "default", "v1.9.5", "", ""),
143+
configMapName: "core-cluster-api-v1.10.0-beta.0",
144+
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "components-missing", "default", "v1.10.0-beta.0", "", ""),
145145
metadataKey: "metadata.yaml",
146146
metadataData: []byte("test"),
147147
componentsKey: "incorrect-components.yaml",
@@ -154,7 +154,7 @@ func TestPreloadCommand(t *testing.T) {
154154
name: "OCI override with missing image",
155155
existingProviders: []genericprovider.GenericProvider{
156156
func() genericprovider.GenericProvider {
157-
p := generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", "")
157+
p := generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.10.0-beta.0", "", "")
158158
spec := p.GetSpec()
159159
spec.FetchConfig = &operatorv1.FetchConfiguration{
160160
OCIConfiguration: operatorv1.OCIConfiguration{

‎config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3034,27 +3034,32 @@ spec:
30343034
properties:
30353035
lastTransitionTime:
30363036
description: |-
3037-
Last time the condition transitioned from one status to another.
3037+
lastTransitionTime is the last time the condition transitioned from one status to another.
30383038
This should be when the underlying condition changed. If that is not known, then using the time when
30393039
the API field changed is acceptable.
30403040
format: date-time
30413041
type: string
30423042
message:
30433043
description: |-
3044-
A human readable message indicating details about the transition.
3044+
message is a human readable message indicating details about the transition.
30453045
This field may be empty.
3046+
maxLength: 10240
3047+
minLength: 1
30463048
type: string
30473049
reason:
30483050
description: |-
3049-
The reason for the condition's last transition in CamelCase.
3051+
reason is the reason for the condition's last transition in CamelCase.
30503052
The specific API may choose whether or not this field is considered a guaranteed API.
30513053
This field may be empty.
3054+
maxLength: 256
3055+
minLength: 1
30523056
type: string
30533057
severity:
30543058
description: |-
30553059
severity provides an explicit classification of Reason code, so the users or machines can immediately
30563060
understand the current situation and act accordingly.
30573061
The Severity field MUST be set only when Status=False.
3062+
maxLength: 32
30583063
type: string
30593064
status:
30603065
description: status of the condition, one of True, False, Unknown.
@@ -3064,6 +3069,8 @@ spec:
30643069
type of condition in CamelCase or in foo.example.com/CamelCase.
30653070
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
30663071
can be useful (see .node.status.conditions), the ability to deconflict is important.
3072+
maxLength: 256
3073+
minLength: 1
30673074
type: string
30683075
required:
30693076
- lastTransitionTime

‎config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,27 +1589,32 @@ spec:
15891589
properties:
15901590
lastTransitionTime:
15911591
description: |-
1592-
Last time the condition transitioned from one status to another.
1592+
lastTransitionTime is the last time the condition transitioned from one status to another.
15931593
This should be when the underlying condition changed. If that is not known, then using the time when
15941594
the API field changed is acceptable.
15951595
format: date-time
15961596
type: string
15971597
message:
15981598
description: |-
1599-
A human readable message indicating details about the transition.
1599+
message is a human readable message indicating details about the transition.
16001600
This field may be empty.
1601+
maxLength: 10240
1602+
minLength: 1
16011603
type: string
16021604
reason:
16031605
description: |-
1604-
The reason for the condition's last transition in CamelCase.
1606+
reason is the reason for the condition's last transition in CamelCase.
16051607
The specific API may choose whether or not this field is considered a guaranteed API.
16061608
This field may be empty.
1609+
maxLength: 256
1610+
minLength: 1
16071611
type: string
16081612
severity:
16091613
description: |-
16101614
severity provides an explicit classification of Reason code, so the users or machines can immediately
16111615
understand the current situation and act accordingly.
16121616
The Severity field MUST be set only when Status=False.
1617+
maxLength: 32
16131618
type: string
16141619
status:
16151620
description: status of the condition, one of True, False, Unknown.
@@ -1619,6 +1624,8 @@ spec:
16191624
type of condition in CamelCase or in foo.example.com/CamelCase.
16201625
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
16211626
can be useful (see .node.status.conditions), the ability to deconflict is important.
1627+
maxLength: 256
1628+
minLength: 1
16221629
type: string
16231630
required:
16241631
- lastTransitionTime
@@ -4664,27 +4671,32 @@ spec:
46644671
properties:
46654672
lastTransitionTime:
46664673
description: |-
4667-
Last time the condition transitioned from one status to another.
4674+
lastTransitionTime is the last time the condition transitioned from one status to another.
46684675
This should be when the underlying condition changed. If that is not known, then using the time when
46694676
the API field changed is acceptable.
46704677
format: date-time
46714678
type: string
46724679
message:
46734680
description: |-
4674-
A human readable message indicating details about the transition.
4681+
message is a human readable message indicating details about the transition.
46754682
This field may be empty.
4683+
maxLength: 10240
4684+
minLength: 1
46764685
type: string
46774686
reason:
46784687
description: |-
4679-
The reason for the condition's last transition in CamelCase.
4688+
reason is the reason for the condition's last transition in CamelCase.
46804689
The specific API may choose whether or not this field is considered a guaranteed API.
46814690
This field may be empty.
4691+
maxLength: 256
4692+
minLength: 1
46824693
type: string
46834694
severity:
46844695
description: |-
46854696
severity provides an explicit classification of Reason code, so the users or machines can immediately
46864697
understand the current situation and act accordingly.
46874698
The Severity field MUST be set only when Status=False.
4699+
maxLength: 32
46884700
type: string
46894701
status:
46904702
description: status of the condition, one of True, False, Unknown.
@@ -4694,6 +4706,8 @@ spec:
46944706
type of condition in CamelCase or in foo.example.com/CamelCase.
46954707
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
46964708
can be useful (see .node.status.conditions), the ability to deconflict is important.
4709+
maxLength: 256
4710+
minLength: 1
46974711
type: string
46984712
required:
46994713
- lastTransitionTime

‎config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,27 +1590,32 @@ spec:
15901590
properties:
15911591
lastTransitionTime:
15921592
description: |-
1593-
Last time the condition transitioned from one status to another.
1593+
lastTransitionTime is the last time the condition transitioned from one status to another.
15941594
This should be when the underlying condition changed. If that is not known, then using the time when
15951595
the API field changed is acceptable.
15961596
format: date-time
15971597
type: string
15981598
message:
15991599
description: |-
1600-
A human readable message indicating details about the transition.
1600+
message is a human readable message indicating details about the transition.
16011601
This field may be empty.
1602+
maxLength: 10240
1603+
minLength: 1
16021604
type: string
16031605
reason:
16041606
description: |-
1605-
The reason for the condition's last transition in CamelCase.
1607+
reason is the reason for the condition's last transition in CamelCase.
16061608
The specific API may choose whether or not this field is considered a guaranteed API.
16071609
This field may be empty.
1610+
maxLength: 256
1611+
minLength: 1
16081612
type: string
16091613
severity:
16101614
description: |-
16111615
severity provides an explicit classification of Reason code, so the users or machines can immediately
16121616
understand the current situation and act accordingly.
16131617
The Severity field MUST be set only when Status=False.
1618+
maxLength: 32
16141619
type: string
16151620
status:
16161621
description: status of the condition, one of True, False, Unknown.
@@ -1620,6 +1625,8 @@ spec:
16201625
type of condition in CamelCase or in foo.example.com/CamelCase.
16211626
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
16221627
can be useful (see .node.status.conditions), the ability to deconflict is important.
1628+
maxLength: 256
1629+
minLength: 1
16231630
type: string
16241631
required:
16251632
- lastTransitionTime
@@ -4667,27 +4674,32 @@ spec:
46674674
properties:
46684675
lastTransitionTime:
46694676
description: |-
4670-
Last time the condition transitioned from one status to another.
4677+
lastTransitionTime is the last time the condition transitioned from one status to another.
46714678
This should be when the underlying condition changed. If that is not known, then using the time when
46724679
the API field changed is acceptable.
46734680
format: date-time
46744681
type: string
46754682
message:
46764683
description: |-
4677-
A human readable message indicating details about the transition.
4684+
message is a human readable message indicating details about the transition.
46784685
This field may be empty.
4686+
maxLength: 10240
4687+
minLength: 1
46794688
type: string
46804689
reason:
46814690
description: |-
4682-
The reason for the condition's last transition in CamelCase.
4691+
reason is the reason for the condition's last transition in CamelCase.
46834692
The specific API may choose whether or not this field is considered a guaranteed API.
46844693
This field may be empty.
4694+
maxLength: 256
4695+
minLength: 1
46854696
type: string
46864697
severity:
46874698
description: |-
46884699
severity provides an explicit classification of Reason code, so the users or machines can immediately
46894700
understand the current situation and act accordingly.
46904701
The Severity field MUST be set only when Status=False.
4702+
maxLength: 32
46914703
type: string
46924704
status:
46934705
description: status of the condition, one of True, False, Unknown.
@@ -4697,6 +4709,8 @@ spec:
46974709
type of condition in CamelCase or in foo.example.com/CamelCase.
46984710
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
46994711
can be useful (see .node.status.conditions), the ability to deconflict is important.
4712+
maxLength: 256
4713+
minLength: 1
47004714
type: string
47014715
required:
47024716
- lastTransitionTime

0 commit comments

Comments
 (0)