Skip to content

Commit

Permalink
🌱 update to cluster API v1.7.4 (#1384)
Browse files Browse the repository at this point in the history 
update to cluster API v1.7.4

this commit updates CAPH to latest release of cluster API which is
v1.7.4

Signed-off-by: kranurag7 <[email protected]>
  • Loading branch information
@kranurag7
kranurag7 authored Jul 23, 2024
1 parent a33c475 commit b9b1f9c
Show file tree
Hide file tree
Showing 31 changed files with 623 additions and 70 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ $(CTLPTL):
CLUSTERCTL := $(abspath $(TOOLS_BIN_DIR)/clusterctl)
clusterctl: $(CLUSTERCTL) ## Build a local copy of clusterctl
$(CLUSTERCTL):
curl -sSLf https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/clusterctl-$$(go env GOOS)-$$(go env GOARCH) -o $(CLUSTERCTL)
curl -sSLf https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/clusterctl-$$(go env GOOS)-$$(go env GOARCH) -o $(CLUSTERCTL)
chmod a+rx $(CLUSTERCTL)

HELM := $(abspath $(TOOLS_BIN_DIR)/helm)
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ settings = {
"deploy_observability": False,
"preload_images_for_kind": True,
"kind_cluster_name": "caph",
"capi_version": "v1.7.3",
"capi_version": "v1.7.4",
"cabpt_version": "v0.5.6",
"cacppt_version": "v0.4.11",
"cert_manager_version": "v1.11.0",
Expand Down
4 changes: 2 additions & 2 deletions docs/caph/04-developers/02-tilt.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ title: Reference of Tilt
"deploy_observability": False,
"preload_images_for_kind": True,
"kind_cluster_name": "caph",
"capi_version": "v1.7.3",
"capi_version": "v1.7.4",
"cabpt_version": "v0.5.5",
"cacppt_version": "v0.4.10",
"cert_manager_version": "v1.11.0",
Expand All @@ -37,5 +37,5 @@ title: Reference of Tilt
| `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 |
| `preload_images_for_kind` | `bool` | `true` | no | If set to true, uses `kind load docker-image` to preload images into a kind cluster |
| `kind_cluster_name` | `[]object` | `"caph"` | no | The name of the kind cluster to use when preloading images |
| `capi_version` | `string` | `"v1.7.3"` | no | Version of CAPI |
| `capi_version` | `string` | `"v1.7.4"` | no | Version of CAPI |
| `cert_manager_version` | `string` | `"v1.11.0"` | no | Version of cert manager |
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.29.3
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/cluster-api v1.7.3
sigs.k8s.io/cluster-api/test v1.7.3
sigs.k8s.io/cluster-api v1.7.4
sigs.k8s.io/cluster-api/test v1.7.4
sigs.k8s.io/controller-runtime v0.17.5
sigs.k8s.io/kind v0.23.0
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
sigs.k8s.io/cluster-api/test v1.7.3 h1:Nl1IOF03MZzjr6x45IJOFWlV4cNHpJ45qsn3A+1Tf98=
sigs.k8s.io/cluster-api/test v1.7.3/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4=
sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4=
sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
sigs.k8s.io/cluster-api/test v1.7.4 h1:yBeWaQoPcAbLMF/ddgz0IWJiFgfJe+QfZJ4QWexMVOw=
sigs.k8s.io/cluster-api/test v1.7.4/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4=
sigs.k8s.io/controller-runtime v0.17.5 h1:1FI9Lm7NiOOmBsgTV36/s2XrEFXnO2C4sbg/Zme72Rw=
sigs.k8s.io/controller-runtime v0.17.5/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/config/hetzner-ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.7.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/core-components.yaml"
- name: v1.7.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -30,8 +30,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.7.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/bootstrap-components.yaml"
- name: v1.7.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/bootstrap-components.yaml"
type: "url"
contract: "v1beta1"
files:
Expand All @@ -47,8 +47,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.7.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/control-plane-components.yaml"
- name: v1.7.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/control-plane-components.yaml"
type: "url"
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
Expand Down Expand Up @@ -120,7 +120,7 @@ variables:

# NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
# the management cluster to be upgraded.
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/clusterctl-linux-amd64"
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/clusterctl-linux-amd64"
INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
INIT_WITH_KUBERNETES_VERSION: "v1.29.4"
INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/config/hetzner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.7.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/core-components.yaml"
- name: v1.7.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -30,8 +30,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.7.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/bootstrap-components.yaml"
- name: v1.7.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/bootstrap-components.yaml"
type: "url"
contract: "v1beta1"
files:
Expand All @@ -47,8 +47,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.7.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/control-plane-components.yaml"
- name: v1.7.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/control-plane-components.yaml"
type: "url"
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
Expand Down Expand Up @@ -126,7 +126,7 @@ variables:

# NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
# the management cluster to be upgraded.
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/clusterctl-linux-amd64"
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/clusterctl-linux-amd64"
INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
INIT_WITH_KUBERNETES_VERSION: "v1.28.9"
INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/strings/slices
k8s.io/utils/trace
# sigs.k8s.io/cluster-api v1.7.3
# sigs.k8s.io/cluster-api v1.7.4
## explicit; go 1.21
sigs.k8s.io/cluster-api/api/v1beta1
sigs.k8s.io/cluster-api/api/v1beta1/index
Expand Down Expand Up @@ -1175,7 +1175,7 @@ sigs.k8s.io/cluster-api/util/topology
sigs.k8s.io/cluster-api/util/version
sigs.k8s.io/cluster-api/util/yaml
sigs.k8s.io/cluster-api/version
# sigs.k8s.io/cluster-api/test v1.7.3
# sigs.k8s.io/cluster-api/test v1.7.4
## explicit; go 1.21
sigs.k8s.io/cluster-api/test/e2e
sigs.k8s.io/cluster-api/test/e2e/internal/log
Expand Down
13 changes: 11 additions & 2 deletions vendor/sigs.k8s.io/cluster-api/api/v1beta1/clusterclass_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions vendor/sigs.k8s.io/cluster-api/api/v1beta1/machinedeployment_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions vendor/sigs.k8s.io/cluster-api/api/v1beta1/machinehealthcheck_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions vendor/sigs.k8s.io/cluster-api/api/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b9b1f9c

Please sign in to comment.