Skip to content

Commit d018afd

Browse files
furkatgofurov7furkatgofurov7
committed
Bump CAPI to latest v1.9.5 patch release
Signed-off-by: Furkat Gofurov <[email protected]>
1 parent 6b72fcd commit d018afd

File tree

9 files changed

+45
-45
lines changed

9 files changed

+45
-45
lines changed

‎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.3-metadata.yaml infrastructure-docker-v1.9.3-components.yaml
69+
oras push ttl.sh/infrastructure-provider:tag infrastructure-docker-v1.9.5-metadata.yaml infrastructure-docker-v1.9.5-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.3",
68-
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.3", "", ""),
67+
configMapName: "core-cluster-api-v1.9.5",
68+
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.5", "", ""),
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.3",
83-
provider: generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.3", "", ""),
84-
metadataKey: "core-cluster-api-v1.9.3-metadata.yaml",
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",
8585
metadataData: []byte("metadata"),
86-
componentsKey: "core-cluster-api-v1.9.3-components.yaml",
86+
componentsKey: "core-cluster-api-v1.9.5-components.yaml",
8787
componentsData: []byte("components"),
8888
}, {
89-
configMapName: "infrastructure-docker-v1.9.3",
90-
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.3", "", ""),
91-
metadataKey: "infrastructure-docker-v1.9.3-metadata.yaml",
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",
9292
metadataData: []byte("metadata"),
93-
componentsKey: "infrastructure-docker-v1.9.3-components.yaml",
93+
componentsKey: "infrastructure-docker-v1.9.5-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.3", "", "")
103+
p := generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", "")
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.3", "", ""),
119-
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.3", "", ""),
118+
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "default", "v1.9.5", "", ""),
119+
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", ""),
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.3",
129-
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "metadata-missing", "default", "v1.9.3", "", ""),
128+
configMapName: "core-cluster-api-v1.9.5",
129+
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "metadata-missing", "default", "v1.9.5", "", ""),
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.3",
144-
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "components-missing", "default", "v1.9.3", "", ""),
143+
configMapName: "core-cluster-api-v1.9.5",
144+
provider: generateGenericProvider(clusterctlv1.InfrastructureProviderType, "components-missing", "default", "v1.9.5", "", ""),
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.3", "", "")
157+
p := generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "default", "v1.9.5", "", "")
158158
spec := p.GetSpec()
159159
spec.FetchConfig = &operatorv1.FetchConfiguration{
160160
OCIConfiguration: operatorv1.OCIConfiguration{

‎docs/book/src/03_topics/03_plugin/03_publish_subcommand.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@ kubectl operator publish -u ttl.sh/${IMAGE_NAME}:5m -d manifests -f metadata.yam
3838

3939
## Publishing Multiple Providers and Versions in an OCI Image
4040

41-
This example demonstrates how to publish three different providers (`control-plane kubeadm`, `bootstrap kubeadm`, and `infrastructure docker`) along with their versioned metadata and components files into a **single OCI image**. Each provider has two versions (`v1.9.3` and `v1.9.4`), and the corresponding metadata and components files follow versioned naming conventions.
41+
This example demonstrates how to publish three different providers (`control-plane kubeadm`, `bootstrap kubeadm`, and `infrastructure docker`) along with their versioned metadata and components files into a **single OCI image**. Each provider has two versions (`v1.9.4` and `v1.9.5`), and the corresponding metadata and components files follow versioned naming conventions.
4242

4343
The following layout for the directory can be used:
4444

4545
```bash
4646
manifests/
47-
├── control-plane-kubeadm-v1.9.3-metadata.yaml
48-
├── control-plane-kubeadm-v1.9.3-components.yaml
49-
├── bootstrap-kubeadm-v1.9.3-metadata.yaml
50-
├── bootstrap-kubeadm-v1.9.3-components.yaml
51-
├── infrastructure-docker-v1.9.3-metadata.yaml
52-
├── infrastructure-docker-v1.9.3-components.yaml
5347
├── control-plane-kubeadm-v1.9.4-metadata.yaml
5448
├── control-plane-kubeadm-v1.9.4-components.yaml
5549
├── bootstrap-kubeadm-v1.9.4-metadata.yaml
5650
├── bootstrap-kubeadm-v1.9.4-components.yaml
57-
└── infrastructure-docker-v1.9.4-metadata.yaml
58-
└── infrastructure-docker-v1.9.4-components.yaml
51+
├── infrastructure-docker-v1.9.4-metadata.yaml
52+
├── infrastructure-docker-v1.9.4-components.yaml
53+
├── control-plane-kubeadm-v1.9.5-metadata.yaml
54+
├── control-plane-kubeadm-v1.9.5-components.yaml
55+
├── bootstrap-kubeadm-v1.9.5-metadata.yaml
56+
├── bootstrap-kubeadm-v1.9.5-components.yaml
57+
└── infrastructure-docker-v1.9.5-metadata.yaml
58+
└── infrastructure-docker-v1.9.5-components.yaml
5959
```
6060

6161
```bash
6262
capioperator publish -u my-registry.example.com/providers:latest -d manifests \
6363
```
6464

65-
This will publish both versions (`v1.9.3` and `v1.9.4`) of each provider into single OCI image, and each version will have its corresponding metadata and component files.
65+
This will publish both versions (`v1.9.4` and `v1.9.5`) of each provider into single OCI image, and each version will have its corresponding metadata and component files.
6666

6767
### Publish with authentication
6868
If authentication is required for the OCI registry, you can specify credentials using environment variables:

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
k8s.io/klog/v2 v2.130.1
2525
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2626
oras.land/oras-go/v2 v2.5.0
27-
sigs.k8s.io/cluster-api v1.9.4
28-
sigs.k8s.io/controller-runtime v0.19.5
27+
sigs.k8s.io/cluster-api v1.9.5
28+
sigs.k8s.io/controller-runtime v0.19.6
2929
sigs.k8s.io/yaml v1.4.0
3030
)
3131

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,10 @@ oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
414414
oras.land/oras-go/v2 v2.5.0/go.mod h1:z4eisnLP530vwIOUOJeBIj0aGI0L1C3d53atvCBqZHg=
415415
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
416416
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
417-
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
418-
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
419-
sigs.k8s.io/controller-runtime v0.19.5 h1:rsE2cRYe0hK/rAAwiS1bwqgEcgCxTz9lavs3FMgLW0c=
420-
sigs.k8s.io/controller-runtime v0.19.5/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
417+
sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro=
418+
sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
419+
sigs.k8s.io/controller-runtime v0.19.6 h1:fuq53qTLQ7aJTA7aNsklNnu7eQtSFqJUomOyM+phPLk=
420+
sigs.k8s.io/controller-runtime v0.19.6/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
421421
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
422422
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
423423
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎hack/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module sigs.k8s.io/cluster-api-operator/hack/tools
33
go 1.23
44

55
replace (
6-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.4
7-
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.9.4
6+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.5
7+
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.9.5
88
)
99

1010
require (

‎hack/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
279279
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
280280
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
281281
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
282-
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
283-
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
282+
sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro=
283+
sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
284284
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116064735-bfe8d0d16ff3 h1:pbVMlqGtkJvCBYntRFIEsvOIGzoTTJtjW1hBEoZMSYk=
285285
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116064735-bfe8d0d16ff3/go.mod h1:1p1NPNOaoJmhqeNiXzNvRMOEFSdJhOwSJtSyfwigFMA=
286286
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240215143116-d0396a3d6f9f h1:Gwi5DDJP7yEqI9SqzAKfdJfsArXZ45H66DCjx6glIww=

‎test/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ require (
1515
k8s.io/klog/v2 v2.130.1
1616
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
1717
oras.land/oras-go/v2 v2.5.0
18-
sigs.k8s.io/cluster-api v1.9.4
18+
sigs.k8s.io/cluster-api v1.9.5
1919
sigs.k8s.io/cluster-api-operator v0.0.0-00010101000000-000000000000
2020
sigs.k8s.io/cluster-api/test v1.9.4
21-
sigs.k8s.io/controller-runtime v0.19.5
21+
sigs.k8s.io/controller-runtime v0.19.6
2222
sigs.k8s.io/yaml v1.4.0
2323
)
2424

‎test/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,12 @@ oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
412412
oras.land/oras-go/v2 v2.5.0/go.mod h1:z4eisnLP530vwIOUOJeBIj0aGI0L1C3d53atvCBqZHg=
413413
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
414414
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
415-
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
416-
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
415+
sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro=
416+
sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
417417
sigs.k8s.io/cluster-api/test v1.9.4 h1:ZZ+IPK/lfyc4d/QPtompt+cxXYC6tGJ4kTHhhocgbIM=
418418
sigs.k8s.io/cluster-api/test v1.9.4/go.mod h1:dHLUcNc9vBNyQyY6NTcqcfpFvIiXmcL5Iqe2sETFD1c=
419-
sigs.k8s.io/controller-runtime v0.19.5 h1:rsE2cRYe0hK/rAAwiS1bwqgEcgCxTz9lavs3FMgLW0c=
420-
sigs.k8s.io/controller-runtime v0.19.5/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
419+
sigs.k8s.io/controller-runtime v0.19.6 h1:fuq53qTLQ7aJTA7aNsklNnu7eQtSFqJUomOyM+phPLk=
420+
sigs.k8s.io/controller-runtime v0.19.6/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
421421
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
422422
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
423423
sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=

0 commit comments

Comments
 (0)