K8S-497 switch repository

Author: dfateyev

addons/upgrade.jps

@@ -304,7 +304,7 @@ actions:
     - cmd[${this.id}]: |-
         while true; do echo "$(kubectl get nodes --no-headers 2>/dev/null)" | grep -qv '\sReady\s' || break; sleep 3; done
         # drop in k8s-1.20+
-        wget -nv https://app-artifacts.s3.eu-central-1.amazonaws.com/kubernetes/k8sm-config -O /usr/local/sbin/k8sm-config
+        wget -nv https://app-artifacts.s3.eu-central-1.amazonaws.com/kubernetes/tools/k8sm-config -O /usr/local/sbin/k8sm-config
         chmod +x /usr/local/sbin/k8sm-config
         /usr/local/sbin/k8sm-config -f
         kubeadm_package=kubeadm-$(echo '${this.version}' | cut -d 'v' -f2)-1.el7.x86_64
@@ -328,8 +328,6 @@ actions:
         sed -i 's%\(.*\)--fail-swap-on=[^[:space:]\"]\+%\1%g' /etc/sysconfig/kubelet
         sed -i 's%\(.*\)--cgroup-driver=[^[:space:]\"]\+%\1%g' /etc/sysconfig/kubelet
         sed -i 's%\(.*\)--cgroup-driver=[^[:space:]\"]\+%\1%g' /var/lib/kubelet/kubeadm-flags.env
-        grep -q '^cgroupDriver:' /var/lib/kubelet/config.yaml || sed -i '/^kind: KubeletConfiguration/a cgroupDriver: systemd' /var/lib/kubelet/config.yaml
-        grep -q '^failSwapOn:' /var/lib/kubelet/config.yaml || sed -i '/^kind: KubeletConfiguration/a failSwapOn: false' /var/lib/kubelet/config.yaml
         wget -nv ${baseUrl}/configs/redeploy.conf -O /tmp/redeploy.conf.stock
         sed -i -e '$a\' /tmp/redeploy.conf.stock
         cat /tmp/redeploy.conf.stock /etc/jelastic/redeploy.conf > /tmp/redeploy.conf.merged
@@ -408,8 +406,6 @@ actions:
         sed -i 's%\(.*\)--fail-swap-on=[^[:space:]\"]\+%\1%g' /etc/sysconfig/kubelet
         sed -i 's%\(.*\)--cgroup-driver=[^[:space:]\"]\+%\1%g' /etc/sysconfig/kubelet
         sed -i 's%\(.*\)--cgroup-driver=[^[:space:]\"]\+%\1%g' /var/lib/kubelet/kubeadm-flags.env
-        grep -q '^cgroupDriver:' /var/lib/kubelet/config.yaml || sed -i '/^kind: KubeletConfiguration/a cgroupDriver: systemd' /var/lib/kubelet/config.yaml
-        grep -q '^failSwapOn:' /var/lib/kubelet/config.yaml || sed -i '/^kind: KubeletConfiguration/a failSwapOn: false' /var/lib/kubelet/config.yaml
         wget -nv ${baseUrl}/configs/redeploy.conf -O /tmp/redeploy.conf.stock
         sed -i -e '$a\' /tmp/redeploy.conf.stock
         cat /tmp/redeploy.conf.stock /etc/jelastic/redeploy.conf > /tmp/redeploy.conf.merged

addons/weave-pack.yaml

@@ -120,7 +120,7 @@ items:
         spec:
           initContainers:
             - name: weave-init
-              image: 'jelastic/weave-kube:2.8.1'
+              image: 'public.ecr.aws/t6h9l3f8/weave-kube:2.8.1'
               command:
                 - /home/weave/init.sh
               env:
@@ -158,7 +158,7 @@ items:
                   value: '1'
                 - name: IPALLOC_RANGE
                   value: 10.239.0.0/16
-              image: 'jelastic/weave-kube:2.8.1'
+              image: 'public.ecr.aws/t6h9l3f8/weave-kube:2.8.1'
               readinessProbe:
                 httpGet:
                   host: 127.0.0.1
@@ -188,7 +188,7 @@ items:
                     fieldRef:
                       apiVersion: v1
                       fieldPath: spec.nodeName
-              image: 'jelastic/weave-npc:2.8.1'
+              image: 'public.ecr.aws/t6h9l3f8/weave-npc:2.8.1'
 #npc-args
               resources:
                 requests:

scripts/configure-instance.sh

@@ -84,8 +84,8 @@ done < <( kubeadm config images list --config /etc/kubernetes/custom-kubeadm.yam
 # weave
 [ -n "${WEAVE}" ] && {
 	echo "$(date): pulling weave docker images";
-	docker pull jelastic/weave-npc:${WEAVE};
-	docker pull jelastic/weave-kube:${WEAVE};
+	docker pull public.ecr.aws/t6h9l3f8/weave-npc:${WEAVE};
+	docker pull public.ecr.aws/t6h9l3f8/weave-kube:${WEAVE};
 }
 
 # additional