Skip to content

Commit

Permalink
[release-1.1] Update capi 115 and capdo images (#363)
Browse files Browse the repository at this point in the history 
* update capi to 1.1.5

Signed-off-by: cpanato <ctadeu@gmail.com>

* update capdo images to use 1.22.11 and 1.23.8

Signed-off-by: cpanato <ctadeu@gmail.com>

Co-authored-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
@k8s-infra-cherrypick-robot @cpanato
k8s-infra-cherrypick-robot and cpanato committed Jul 6, 2022
1 parent dedf6e1 commit ab5efb3
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -431,7 +431,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.1.4/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/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.1.4",
"capi_version": "v1.1.5",
"cert_manager_version": "v1.1.0",
"kubernetes_version": "v1.22.3",
}
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Expand Up @@ -16,8 +16,8 @@ require (
k8s.io/client-go v0.23.6
k8s.io/klog/v2 v2.60.1
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
sigs.k8s.io/cluster-api v1.1.4
sigs.k8s.io/cluster-api/test v1.1.4
sigs.k8s.io/cluster-api v1.1.5
sigs.k8s.io/cluster-api/test v1.1.5
sigs.k8s.io/controller-runtime v0.11.2
)

Expand All @@ -37,9 +37,9 @@ require (
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coredns/caddy v1.1.0 // indirect
github.com/coredns/corefile-migration v1.0.14 // indirect
github.com/coredns/corefile-migration v1.0.17 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.16+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
Expand Down Expand Up @@ -123,4 +123,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.4
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.5
15 changes: 8 additions & 7 deletions go.sum
View file
Expand Up @@ -135,8 +135,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
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.14 h1:Tz3WZhoj2NdP8drrQH86NgnCng+VrPjNeg2Oe1ALKag=
github.com/coredns/corefile-migration v1.0.14/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
github.com/coredns/corefile-migration v1.0.17 h1:tNwh8+4WOANV6NjSljwgW7qViJfhvPUt1kosj4rR8yg=
github.com/coredns/corefile-migration v1.0.17/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
Expand All @@ -161,8 +161,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/digitalocean/godo v1.81.0 h1:sjb3fOfPfSlUQUK22E87BcI8Zx2qtnF7VUCCO4UK3C8=
github.com/digitalocean/godo v1.81.0/go.mod h1:BPCqvwbjbGqxuUnIKB4EvS/AX7IDnNmt5fwvIkWo+ew=
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.16+incompatible h1:2Db6ZR/+FUR3hqPMwnogOPHFn405crbpxvWzKovETOQ=
github.com/docker/docker v20.10.16+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
Expand Down Expand Up @@ -1246,10 +1247,10 @@ 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/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
sigs.k8s.io/cluster-api v1.1.4 h1:mD44GELeiMfQKxyBmsxdYn/FmNAIkFWr2auM++qxx1A=
sigs.k8s.io/cluster-api v1.1.4/go.mod h1:luiK6hLylbm4Kc7dkRw6KPAvNum9sAqpz5DfkdCaSW8=
sigs.k8s.io/cluster-api/test v1.1.4 h1:QJSVvAeGtBSf4ImRiyPe1cTZJAGC7QGHZckEfCjLGco=
sigs.k8s.io/cluster-api/test v1.1.4/go.mod h1:10gpXFNXUuYHoFfmGR98KfsJHuTQIWjRkiU8ggmXbrc=
sigs.k8s.io/cluster-api v1.1.5 h1:4gV3mg1mlwrm3bFWeXADfL9ILRyufjR47KpwBL3PT6Y=
sigs.k8s.io/cluster-api v1.1.5/go.mod h1:WBPgw1yJdvybx/U3Ib49T9Q4JurairgnA/s0afxuE/w=
sigs.k8s.io/cluster-api/test v1.1.5 h1:jukMEA50R3V6G7VcJMR7dMZJPd3Tuf0Orc/6CKuS9Ek=
sigs.k8s.io/cluster-api/test v1.1.5/go.mod h1:NXFioUFKruk/PgpUt4QrprV9bN1rVUcm7OWao9dfesg=
sigs.k8s.io/controller-runtime v0.11.2 h1:H5GTxQl0Mc9UjRJhORusqfJCIjBO8UtUxGggCwL1rLA=
sigs.k8s.io/controller-runtime v0.11.2/go.mod h1:P6QCzrEjLaZGqHsfd+os7JQ+WFZhvB8MRFsn4dWF7O4=
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
Expand Down
34 changes: 17 additions & 17 deletions test/e2e/config/digitalocean-ci.yaml
View file
Expand Up @@ -7,8 +7,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.1.4
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/core-components.yaml
- name: v1.1.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/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.1.4
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/bootstrap-components.yaml
- name: v1.1.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/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.1.4
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/control-plane-components.yaml
- name: v1.1.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand Down Expand Up @@ -67,32 +67,32 @@ providers:

variables:
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
KUBERNETES_VERSION: "v1.22.6"
KUBERNETES_VERSION: "v1.22.11"
EXP_CLUSTER_RESOURCE_SET: "true"
# Cluster Addons
CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"
CCM: "${PWD}/test/e2e/data/ccm/digitalocean-cloud-controller-manager.yaml"
# Following CAPDO variables should be set before testing
DO_REGION: "nyc1"
DO_CONTROL_PLANE_MACHINE_TYPE: "s-2vcpu-2gb"
# Cluster API Kubernetes v1.22.6 on Ubuntu 20.04
DO_CONTROL_PLANE_MACHINE_IMAGE: "101591787"
# Cluster API Kubernetes v1.22.11 on Ubuntu 20.04
DO_CONTROL_PLANE_MACHINE_IMAGE: "110971350"
DO_NODE_MACHINE_TYPE: "s-2vcpu-2gb"
# Cluster API Kubernetes v1.22.6 on Ubuntu 20.04
DO_NODE_MACHINE_IMAGE: "101591787"
# Cluster API Kubernetes v1.22.11 on Ubuntu 20.04
DO_NODE_MACHINE_IMAGE: "110971350"
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
KUBETEST_CONFIGURATION: "${PWD}/test/e2e/data/kubetest/conformance.yaml"
ETCD_VERSION_UPGRADE_TO: "3.5.1-0"
COREDNS_VERSION_UPGRADE_TO: "v1.8.6"
# Cluster API Kubernetes v1.22.6 on Ubuntu 20.04
KUBERNETES_IMAGE_UPGRADE_FROM: "101591787"
# Cluster API Kubernetes v1.23.3 on Ubuntu 20.04
KUBERNETES_IMAGE_UPGRADE_TO: "101593074"
# Cluster API Kubernetes v1.22.11 on Ubuntu 20.04
KUBERNETES_IMAGE_UPGRADE_FROM: "110971350"
# Cluster API Kubernetes v1.23.8 on Ubuntu 20.04
KUBERNETES_IMAGE_UPGRADE_TO: "110971520"
CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "cp-k8s-upgrade-and-conformance"
WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "worker-k8s-upgrade-and-conformance"
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.23.3}"
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.22.6}"
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.23.8}"
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.22.11}"
IP_FAMILY: "IPv4"

intervals:
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/config/digitalocean-dev.yaml
View file
Expand Up @@ -7,8 +7,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.1.4
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/core-components.yaml
- name: v1.1.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/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.1.4
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/bootstrap-components.yaml
- name: v1.1.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/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.1.4
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/control-plane-components.yaml
- name: v1.1.5
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml
type: "url"
files:
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
Expand All @@ -61,7 +61,7 @@ providers:

variables:
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
KUBERNETES_VERSION: "v1.22.4"
KUBERNETES_VERSION: "v1.22.11"
EXP_CLUSTER_RESOURCE_SET: "true"
# Cluster Addons
CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"
Expand Down

0 comments on commit ab5efb3

Please sign in to comment.