From 10ea4ecbf1f8ddd8c9e4b5cb1b1adf95827c1a39 Mon Sep 17 00:00:00 2001 From: jinho0928 Date: Thu, 31 Aug 2023 11:13:22 +0900 Subject: [PATCH 1/2] update calico version in capi-vsphere-template.yaml update calico version in capi-vsphere-template.yaml --- config/capi-template/capi-vsphere-template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/capi-template/capi-vsphere-template.yaml b/config/capi-template/capi-vsphere-template.yaml index 3f7a817..a6e1a6f 100644 --- a/config/capi-template/capi-vsphere-template.yaml +++ b/config/capi-template/capi-vsphere-template.yaml @@ -211,7 +211,7 @@ objects: - mkdir -p $HOME/.kube - cp /etc/kubernetes/admin.conf $HOME/.kube/config - chown $USER:$USER $HOME/.kube/config - - kubectl apply -f https://docs.projectcalico.org/archive/v3.16/manifests/calico.yaml + - kubectl apply -f https://docs.projectcalico.org/archive/v3.24/manifests/calico.yaml - sed -i 's/--bind-address=127.0.0.1/--bind-address=0.0.0.0/g' /etc/kubernetes/manifests/kube-controller-manager.yaml || echo - sed -i 's/--bind-address=127.0.0.1/--bind-address=0.0.0.0/g' /etc/kubernetes/manifests/kube-scheduler.yaml || echo - sed -i "s/--listen-metrics-urls=http:\/\/127.0.0.1:2381/--listen-metrics-urls=http:\/\/127.0.0.1:2381,http:\/\/{{ ds.meta_data.local_ipv4 }}:2381/g" /etc/kubernetes/manifests/etcd.yaml || echo @@ -1285,4 +1285,4 @@ parameters: valueType: string recommend: true shortDescription: Cluster template for CAPI provider vSphere upgrade -urlDescription: "" \ No newline at end of file +urlDescription: "" From d654fcebdc3cbb1eaed5fae701a38160f6328c2d Mon Sep 17 00:00:00 2001 From: jinho0928 Date: Fri, 1 Sep 2023 08:44:45 +0900 Subject: [PATCH 2/2] update calico version in capi-aws-template.yaml update calico version in capi-aws-template.yaml --- config/capi-template/capi-aws-template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/capi-template/capi-aws-template.yaml b/config/capi-template/capi-aws-template.yaml index 78fb036..c88b066 100644 --- a/config/capi-template/capi-aws-template.yaml +++ b/config/capi-template/capi-aws-template.yaml @@ -75,7 +75,7 @@ objects: - mkdir -p $HOME/.kube - cp /etc/kubernetes/admin.conf $HOME/.kube/config - chown $USER:$USER $HOME/.kube/config - - kubectl apply -f https://docs.projectcalico.org/archive/v3.16/manifests/calico.yaml + - kubectl apply -f https://docs.projectcalico.org/archive/v3.24/manifests/calico.yaml - sed -i 's/--bind-address=127.0.0.1/--bind-address=0.0.0.0/g' /etc/kubernetes/manifests/kube-controller-manager.yaml || echo - sed -i 's/--bind-address=127.0.0.1/--bind-address=0.0.0.0/g' /etc/kubernetes/manifests/kube-scheduler.yaml || echo - sed -i "s/--listen-metrics-urls=http:\/\/127.0.0.1:2381/--listen-metrics-urls=http:\/\/127.0.0.1:2381,http:\/\/{{ ds.meta_data.local_ipv4 }}:2381/g" /etc/kubernetes/manifests/etcd.yaml || echo @@ -213,4 +213,4 @@ parameters: valueType: number recommend: true shortDescription: Cluster template for CAPI provider AWS -urlDescription: "" \ No newline at end of file +urlDescription: ""