Skip to content

Commit d4480ed

Browse files
furkatgofurov7furkatgofurov7
committed
Bump CAPI to v1.10.0-beta.0
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
1 parent 46d9112 commit d4480ed

File tree

11 files changed

+416
-440
lines changed

11 files changed

+416
-440
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.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{

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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.4` and `v1.9.5`), 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.10.0-beta.0`), and the corresponding metadata and components files follow versioned naming conventions.
4242

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

@@ -50,19 +50,19 @@ manifests/
5050
├── bootstrap-kubeadm-v1.9.4-components.yaml
5151
├── infrastructure-docker-v1.9.4-metadata.yaml
5252
├── 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
53+
├── control-plane-kubeadm-v1.10.0-beta.0-metadata.yaml
54+
├── control-plane-kubeadm-v1.10.0-beta.0-components.yaml
55+
├── bootstrap-kubeadm-v1.10.0-beta.0-metadata.yaml
56+
├── bootstrap-kubeadm-v1.10.0-beta.0-components.yaml
57+
└── infrastructure-docker-v1.10.0-beta.0-metadata.yaml
58+
└── infrastructure-docker-v1.10.0-beta.0-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.4` and `v1.9.5`) 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.10.0-beta.0`) 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: 40 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@ require (
1717
github.com/opencontainers/image-spec v1.1.0
1818
github.com/spf13/cobra v1.9.1
1919
github.com/spf13/pflag v1.0.6
20-
golang.org/x/oauth2 v0.27.0
21-
k8s.io/api v0.31.6
22-
k8s.io/apiextensions-apiserver v0.31.6
23-
k8s.io/apimachinery v0.31.6
24-
k8s.io/client-go v0.31.6
25-
k8s.io/component-base v0.31.6
20+
golang.org/x/oauth2 v0.28.0
21+
k8s.io/api v0.32.3
22+
k8s.io/apiextensions-apiserver v0.32.3
23+
k8s.io/apimachinery v0.32.3
24+
k8s.io/client-go v0.32.3
25+
k8s.io/component-base v0.32.3
2626
k8s.io/klog/v2 v2.130.1
27-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
27+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2828
oras.land/oras-go/v2 v2.5.0
29-
sigs.k8s.io/cluster-api v1.9.5
30-
sigs.k8s.io/controller-runtime v0.19.6
29+
sigs.k8s.io/cluster-api v1.10.0-beta.0
30+
sigs.k8s.io/controller-runtime v0.20.3
3131
sigs.k8s.io/yaml v1.4.0
3232
)
3333

3434
require (
35+
cel.dev/expr v0.18.0 // indirect
3536
dario.cat/mergo v1.0.1 // indirect
3637
github.com/Masterminds/semver/v3 v3.3.0 // indirect
3738
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
@@ -48,57 +49,52 @@ require (
4849
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4950
github.com/distribution/reference v0.6.0 // indirect
5051
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
51-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
52+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5253
github.com/felixge/httpsnoop v1.0.4 // indirect
53-
github.com/fsnotify/fsnotify v1.7.0 // indirect
54+
github.com/fsnotify/fsnotify v1.8.0 // indirect
5455
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5556
github.com/go-logr/stdr v1.2.2 // indirect
56-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
57+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5758
github.com/go-openapi/jsonreference v0.20.2 // indirect
58-
github.com/go-openapi/swag v0.22.4 // indirect
59+
github.com/go-openapi/swag v0.23.0 // indirect
60+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
5961
github.com/gobuffalo/flect v1.0.3 // indirect
6062
github.com/gogo/protobuf v1.3.2 // indirect
61-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6263
github.com/golang/protobuf v1.5.4 // indirect
63-
github.com/google/cel-go v0.20.1 // indirect
64+
github.com/google/btree v1.1.3 // indirect
65+
github.com/google/cel-go v0.22.0 // indirect
6466
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
6567
github.com/google/go-github/v53 v53.2.0 // indirect
6668
github.com/google/go-querystring v1.1.0 // indirect
6769
github.com/google/uuid v1.6.0 // indirect
6870
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
69-
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
7071
github.com/huandu/xstrings v1.5.0 // indirect
71-
github.com/imdario/mergo v0.3.16 // indirect
7272
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7373
github.com/josharian/intern v1.0.0 // indirect
7474
github.com/json-iterator/go v1.1.12 // indirect
75-
github.com/magiconair/properties v1.8.7 // indirect
7675
github.com/mailru/easyjson v0.7.7 // indirect
7776
github.com/mitchellh/copystructure v1.2.0 // indirect
78-
github.com/mitchellh/mapstructure v1.5.0 // indirect
7977
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8078
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8179
github.com/modern-go/reflect2 v1.0.2 // indirect
8280
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8381
github.com/opencontainers/go-digest v1.0.0 // indirect
84-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
82+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
8583
github.com/pkg/errors v0.9.1 // indirect
8684
github.com/prometheus/client_golang v1.19.1 // indirect
8785
github.com/prometheus/client_model v0.6.1 // indirect
8886
github.com/prometheus/common v0.55.0 // indirect
8987
github.com/prometheus/procfs v0.15.1 // indirect
90-
github.com/sagikazarmark/locafero v0.4.0 // indirect
91-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
88+
github.com/sagikazarmark/locafero v0.7.0 // indirect
9289
github.com/shopspring/decimal v1.4.0 // indirect
9390
github.com/sourcegraph/conc v0.3.0 // indirect
94-
github.com/spf13/afero v1.11.0 // indirect
95-
github.com/spf13/cast v1.7.0 // indirect
96-
github.com/spf13/viper v1.19.0 // indirect
97-
github.com/stoewer/go-strcase v1.2.0 // indirect
91+
github.com/spf13/afero v1.12.0 // indirect
92+
github.com/spf13/cast v1.7.1 // indirect
93+
github.com/spf13/viper v1.20.0 // indirect
94+
github.com/stoewer/go-strcase v1.3.0 // indirect
9895
github.com/subosito/gotenv v1.6.0 // indirect
9996
github.com/valyala/fastjson v1.6.4 // indirect
10097
github.com/x448/float16 v0.8.4 // indirect
101-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
10298
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
10399
go.opentelemetry.io/otel v1.29.0 // indirect
104100
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
@@ -108,29 +104,26 @@ require (
108104
go.opentelemetry.io/otel/trace v1.29.0 // indirect
109105
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
110106
go.uber.org/multierr v1.11.0 // indirect
111-
golang.org/x/crypto v0.35.0 // indirect
107+
golang.org/x/crypto v0.36.0 // indirect
112108
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
113-
golang.org/x/net v0.36.0 // indirect
114-
golang.org/x/sync v0.11.0 // indirect
115-
golang.org/x/sys v0.30.0 // indirect
116-
golang.org/x/term v0.29.0 // indirect
117-
golang.org/x/text v0.22.0 // indirect
118-
golang.org/x/time v0.7.0 // indirect
119-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
120-
google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 // indirect
121-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
122-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
123-
google.golang.org/grpc v1.67.1 // indirect
109+
golang.org/x/net v0.37.0 // indirect
110+
golang.org/x/sync v0.12.0 // indirect
111+
golang.org/x/sys v0.31.0 // indirect
112+
golang.org/x/term v0.30.0 // indirect
113+
golang.org/x/text v0.23.0 // indirect
114+
golang.org/x/time v0.8.0 // indirect
115+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
116+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
117+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
118+
google.golang.org/grpc v1.67.3 // indirect
124119
google.golang.org/protobuf v1.36.1 // indirect
125120
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
126121
gopkg.in/inf.v0 v0.9.1 // indirect
127-
gopkg.in/ini.v1 v1.67.0 // indirect
128-
gopkg.in/yaml.v2 v2.4.0 // indirect
129122
gopkg.in/yaml.v3 v3.0.1 // indirect
130-
k8s.io/apiserver v0.31.6 // indirect
131-
k8s.io/cluster-bootstrap v0.31.3 // indirect
132-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
133-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
134-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
135-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
123+
k8s.io/apiserver v0.32.3 // indirect
124+
k8s.io/cluster-bootstrap v0.32.3 // indirect
125+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
126+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
127+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
128+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
136129
)

0 commit comments

Comments
 (0)