Skip to content

Commit 0fedc30

Browse files
guettliguettli
authored
🌱 Upgrade to Cluster API 1.6.3 (#1204)
🌱 Upgrade to Cluster API 1.6.2
1 parent c6fd5bb commit 0fedc30

File tree

91 files changed

+4665
-1595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+4665
-1595
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ $(CTLPTL):
118118
CLUSTERCTL := $(abspath $(TOOLS_BIN_DIR)/clusterctl)
119119
clusterctl: $(CLUSTERCTL) ## Build a local copy of clusterctl
120120
$(CLUSTERCTL):
121-
curl -sSLf https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/clusterctl-$$(go env GOOS)-$$(go env GOARCH) -o $(CLUSTERCTL)
121+
curl -sSLf https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/clusterctl-$$(go env GOOS)-$$(go env GOARCH) -o $(CLUSTERCTL)
122122
chmod a+rx $(CLUSTERCTL)
123123

124124
HELM := $(abspath $(TOOLS_BIN_DIR)/helm)

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ settings = {
2020
"deploy_observability": False,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "caph",
23-
"capi_version": "v1.6.0",
23+
"capi_version": "v1.6.3",
2424
"cabpt_version": "v0.5.6",
2525
"cacppt_version": "v0.4.11",
2626
"cert_manager_version": "v1.11.0",

‎docs/developers/tilt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"deploy_observability": False,
88
"preload_images_for_kind": True,
99
"kind_cluster_name": "caph",
10-
"capi_version": "v1.6.0",
10+
"capi_version": "v1.6.3",
1111
"cabpt_version": "v0.5.5",
1212
"cacppt_version": "v0.4.10",
1313
"cert_manager_version": "v1.11.0",
@@ -33,7 +33,7 @@
3333
| deploy_observability | bool | false | no | If true, installs grafana, loki and promtail in the dev cluster. Grafana UI will be accessible via a link in the tilt console. Important! This feature requires the `helm` command to be available in the user's path |
3434
| preload_images_for_kind | bool | true | no | If set to true, uses `kind load docker-image` to preload images into a kind cluster |
3535
| kind_cluster_name | []object | "caph" | no | The name of the kind cluster to use when preloading images |
36-
| capi_version | string | "v1.6.0" | no | Version of CAPI |
36+
| capi_version | string | "v1.6.3" | no | Version of CAPI |
3737
| cert_manager_version | string | "v1.11.0" | no | Version of cert manager |
3838
| kustomize_substitutions | map[string]string | {
3939
"HCLOUD_REGION": "fsn1",

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ require (
2323
k8s.io/klog/v2 v2.120.1
2424
k8s.io/kubectl v0.28.4
2525
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
26-
sigs.k8s.io/cluster-api v1.6.0
27-
sigs.k8s.io/cluster-api/test v1.6.0
26+
sigs.k8s.io/cluster-api v1.6.3
27+
sigs.k8s.io/cluster-api/test v1.6.3
2828
sigs.k8s.io/controller-runtime v0.16.5
2929
sigs.k8s.io/kind v0.22.0
3030
)
@@ -123,7 +123,7 @@ require (
123123
google.golang.org/appengine v1.6.7 // indirect
124124
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
125125
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
126-
google.golang.org/protobuf v1.31.0 // indirect
126+
google.golang.org/protobuf v1.33.0 // indirect
127127
gopkg.in/inf.v0 v0.9.1 // indirect
128128
gopkg.in/ini.v1 v1.67.0 // indirect
129129
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
710710
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
711711
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
712712
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
713-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
714-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
713+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
714+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
715715
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
716716
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
717717
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -765,10 +765,10 @@ k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt
765765
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
766766
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
767767
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
768-
sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
769-
sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
770-
sigs.k8s.io/cluster-api/test v1.6.0 h1:hvqUpSYxXCvs4FiEfsDpFZAfZ7i4kkP/59mVdFHlzSI=
771-
sigs.k8s.io/cluster-api/test v1.6.0/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U=
768+
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=
769+
sigs.k8s.io/cluster-api v1.6.3/go.mod h1:4FzfgPPiYaFq8X9F9j2SvmggH/4OOLEDgVJuWDqKLig=
770+
sigs.k8s.io/cluster-api/test v1.6.3 h1:ZCboLCTpKWzSbf+f7MpQT7EN8aeH9DNhJC1T9/vAuAM=
771+
sigs.k8s.io/cluster-api/test v1.6.3/go.mod h1:AKs25dgW6AnyGaQBoWuXfWnBs+FT7vJmAI/aox64DEI=
772772
sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw=
773773
sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
774774
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎test/e2e/config/hetzner-ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ providers:
1313
- name: cluster-api
1414
type: CoreProvider
1515
versions:
16-
- name: v1.6.0
17-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml"
16+
- name: v1.6.3
17+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/core-components.yaml"
1818
type: "url"
1919
contract: v1beta1
2020
files:
@@ -30,8 +30,8 @@ providers:
3030
- name: kubeadm
3131
type: BootstrapProvider
3232
versions:
33-
- name: v1.6.0
34-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml"
33+
- name: v1.6.3
34+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/bootstrap-components.yaml"
3535
type: "url"
3636
contract: "v1beta1"
3737
files:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: ControlPlaneProvider
4949
versions:
50-
- name: v1.6.0
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml"
50+
- name: v1.6.3
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/control-plane-components.yaml"
5252
type: "url"
5353
files:
5454
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -120,7 +120,7 @@ variables:
120120

121121
# NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
122122
# the management cluster to be upgraded.
123-
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/clusterctl-linux-amd64"
123+
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/clusterctl-linux-amd64"
124124
INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
125125
INIT_WITH_KUBERNETES_VERSION: "v1.28.4"
126126
INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}

‎test/e2e/config/hetzner.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ providers:
1313
- name: cluster-api
1414
type: CoreProvider
1515
versions:
16-
- name: v1.6.0
17-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml"
16+
- name: v1.6.3
17+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/core-components.yaml"
1818
type: "url"
1919
contract: v1beta1
2020
files:
@@ -30,8 +30,8 @@ providers:
3030
- name: kubeadm
3131
type: BootstrapProvider
3232
versions:
33-
- name: v1.6.0
34-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml"
33+
- name: v1.6.3
34+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/bootstrap-components.yaml"
3535
type: "url"
3636
contract: "v1beta1"
3737
files:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: ControlPlaneProvider
4949
versions:
50-
- name: v1.6.0
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml"
50+
- name: v1.6.3
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/control-plane-components.yaml"
5252
type: "url"
5353
files:
5454
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -126,7 +126,7 @@ variables:
126126

127127
# NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
128128
# the management cluster to be upgraded.
129-
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/clusterctl-linux-amd64"
129+
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/clusterctl-linux-amd64"
130130
INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
131131
INIT_WITH_KUBERNETES_VERSION: "v1.28.4"
132132
INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}

‎vendor/google.golang.org/protobuf/encoding/protojson/decode.go

Lines changed: 29 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/google.golang.org/protobuf/encoding/protojson/doc.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/google.golang.org/protobuf/encoding/protojson/encode.go

Lines changed: 34 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)