Skip to content

Commit

Permalink
update CAPI to 1.4.8 (#541)
Browse files Browse the repository at this point in the history 
Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
@cpanato
cpanato committed Oct 27, 2023
1 parent 0e7fd31 commit 855433a
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -437,7 +437,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
./hack/install-cert-manager.sh

# Deploy CAPI
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -

# Deploy CAPDO
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capdo
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
View file
Expand Up @@ -16,7 +16,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capdo",
"capi_version": "v1.4.5",
"capi_version": "v1.4.8",
"cert_manager_version": "v1.10.1",
"kubernetes_version": "v1.25.5",
}
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Expand Up @@ -17,8 +17,8 @@ require (
k8s.io/client-go v0.26.7
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/cluster-api v1.4.5
sigs.k8s.io/cluster-api/test v1.4.5
sigs.k8s.io/cluster-api v1.4.8
sigs.k8s.io/cluster-api/test v1.4.8
sigs.k8s.io/controller-runtime v0.14.5
)

Expand All @@ -37,7 +37,7 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coredns/caddy v1.1.0 // indirect
github.com/coredns/corefile-migration v1.0.20 // indirect
github.com/coredns/corefile-migration v1.0.21 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.5+incompatible // indirect
Expand Down Expand Up @@ -102,7 +102,7 @@ require (
github.com/valyala/fastjson v1.6.4 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.16.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
Expand All @@ -128,4 +128,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.5
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.8
16 changes: 8 additions & 8 deletions go.sum
View file
Expand Up @@ -90,8 +90,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
github.com/coredns/corefile-migration v1.0.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI=
github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE=
github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
Expand Down Expand Up @@ -583,8 +583,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -906,10 +906,10 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/cluster-api v1.4.5 h1:Xwi9cuL3FOR1gB6FhhKi7EEadY4m3CdJAesyx9/kxUo=
sigs.k8s.io/cluster-api v1.4.5/go.mod h1:HSiT5mE5uuxctGBiQcRJrZ6/iH+CCVmTvOryxSBcBG8=
sigs.k8s.io/cluster-api/test v1.4.5 h1:0ZuQre03UaxRXgiK3wQjtJNZGebw1xFaPvKFDOi3KaM=
sigs.k8s.io/cluster-api/test v1.4.5/go.mod h1:OMWLTfmTeFqMtprBE1zCDDpYect1M5jcEYYTSY7AgSA=
sigs.k8s.io/cluster-api v1.4.8 h1:9gcmmohqHBw85cuvLxOV7UjuNV9qTVE/Y2s+DHlHgOI=
sigs.k8s.io/cluster-api v1.4.8/go.mod h1:RUzEEOvhL3XL5EEOfv30psPysiKA/qumY4ZU3sjZWo0=
sigs.k8s.io/cluster-api/test v1.4.8 h1:QLMOIbrtRoG15I6wCdx5cUjb4BLm5F2h3+x8k3vdiSY=
sigs.k8s.io/cluster-api/test v1.4.8/go.mod h1:SWwaDU4qKQHWBMU703UWVfWiPqnDyhf+J5MBVHSjQiw=
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/digitalocean-ci.yaml
View file
Expand Up @@ -7,8 +7,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.4.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml
- name: v1.4.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/core-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand All @@ -20,8 +20,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.4.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml
- name: v1.4.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/bootstrap-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand All @@ -33,8 +33,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.4.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml
- name: v1.4.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/control-plane-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/digitalocean-dev.yaml
View file
Expand Up @@ -7,8 +7,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.4.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml
- name: v1.4.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/core-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand All @@ -20,8 +20,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.4.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml
- name: v1.4.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/bootstrap-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand All @@ -33,8 +33,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.4.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml
- name: v1.4.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/control-plane-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand Down

0 comments on commit 855433a

Please sign in to comment.