15 files changed, 30 insertions, 102 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml
index 586f7925..b351697b 100755
--- a/ansible/group_vars/infrastructure.yml
+++ b/ansible/group_vars/infrastructure.yml
@@ -21,7 +21,7 @@ populate_nexus: false
 helm_bin_dir: /usr/local/bin
 helm_version: v2.16.6
 helm3_push_version: 0.9.0
-rancher_server_image: rancher/server:v1.6.22
+rke_kubernetes_version: v1.19.6-rancher1-1
 vnc_server_image: consol/ubuntu-icewm-vnc:1.4.0
 nexus3_image: sonatype/nexus3:3.15.2
 dns_server_image: andyshinn/dnsmasq:2.76
diff --git a/ansible/roles/rke/defaults/main.yml b/ansible/roles/rke/defaults/main.yml
index c9d82d93..c0bd5ef8 100644
--- a/ansible/roles/rke/defaults/main.yml
+++ b/ansible/roles/rke/defaults/main.yml
@@ -50,35 +50,3 @@ rke_etcd:
   enabled_unsafe_volatile_storage: false
   # Size of the volatile storage - tmpfs (this will eat your RAM)
   tmpfs_size: 5G
-
-rke:
-  # rke (rancher) images
-  etcd: "rancher/coreos-etcd:v3.3.10-rancher1"
-  alpine: "rancher/rke-tools:v0.1.52"
-  nginx_proxy: "rancher/rke-tools:v0.1.52"
-  cert_downloader: "rancher/rke-tools:v0.1.52"
-  kubernetes_services_sidecar: "rancher/rke-tools:v0.1.52"
-  kubedns: "rancher/k8s-dns-kube-dns:1.15.0"
-  dnsmasq: "rancher/k8s-dns-dnsmasq-nanny:1.15.0"
-  kubedns_sidecar: "rancher/k8s-dns-sidecar:1.15.0"
-  kubedns_autoscaler: "rancher/cluster-proportional-autoscaler:1.7.1"
-  coredns: "rancher/coredns-coredns:1.6.2"
-  coredns_autoscaler: "rancher/cluster-proportional-autoscaler:1.7.1"
-  kubernetes: "rancher/hyperkube:v1.15.9-rancher1"
-  flannel: "rancher/coreos-flannel:v0.11.0-rancher1"
-  flannel_cni: "rancher/flannel-cni:v0.3.0-rancher5"
-  calico_node: "rancher/calico-node:v3.7.4"
-  calico_cni: "rancher/calico-cni:v3.7.4"
-  calico_controllers: "rancher/calico-kube-controllers:v3.7.4"
-  calico_ctl: "rancher/calico-ctl:v2.0.0"
-  calico_flexvol: "rancher/calico-pod2daemon-flexvol:v3.10.2"
-  canal_node: "rancher/calico-node:v3.7.4"
-  canal_cni: "rancher/calico-cni:v3.7.4"
-  canal_flannel: "rancher/coreos-flannel:v0.11.0"
-  canal_flexvol: "rancher/calico-pod2daemon-flexvol:v3.10.2"
-  weave_node: "weaveworks/weave-kube:2.5.2"
-  weave_cni: "weaveworks/weave-npc:2.5.2"
-  pod_infra_container: "rancher/pause:3.1"
-  ingress: "rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"
-  ingress_backend: "rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1"
-  metrics_server: "rancher/metrics-server:v0.3.3"
diff --git a/ansible/roles/rke/molecule/default/prepare.yml b/ansible/roles/rke/molecule/default/prepare.yml
index d20f1962..d72d6bcf 100644
--- a/ansible/roles/rke/molecule/default/prepare.yml
+++ b/ansible/roles/rke/molecule/default/prepare.yml
@@ -12,6 +12,3 @@
     - role: prepare-rke
       vars:
         mode: infra
-    - role: prepare-kubectl
-      vars:
-        kubectl_install: true
diff --git a/ansible/roles/rke/templates/cluster.yml.j2 b/ansible/roles/rke/templates/cluster.yml.j2
index 53e9a09a..55447286 100644
--- a/ansible/roles/rke/templates/cluster.yml.j2
+++ b/ansible/roles/rke/templates/cluster.yml.j2
@@ -93,34 +93,7 @@ addons: ""
 addons_include:
 - "{{ cluster_config_dir }}/kubernetes-dashboard.yml"
 - "{{ cluster_config_dir }}/k8s-dashboard-user.yml"
-system_images:
-  etcd: "{{ rke.etcd }}"
-  alpine: "{{ rke.alpine }}"
-  nginx_proxy: "{{ rke.nginx_proxy }}"
-  cert_downloader: "{{ rke.cert_downloader }}"
-  kubernetes_services_sidecar: "{{ rke.kubernetes_services_sidecar }}"
-  kubedns: "{{ rke.kubedns }}"
-  dnsmasq: "{{ rke.dnsmasq }}"
-  kubedns_sidecar: "{{ rke.kubedns_sidecar }}"
-  kubedns_autoscaler: "{{ rke.kubedns_autoscaler }}"
-  coredns: "{{ rke.coredns }}"
-  coredns_autoscaler: "{{ rke.coredns_autoscaler }}"
-  kubernetes: "{{ rke.kubernetes }}"
-  flannel: "{{ rke.flannel }}"
-  flannel_cni: "{{ rke.flannel_cni }}"
-  calico_node: "{{ rke.calico_node }}"
-  calico_cni: "{{ rke.calico_cni }}"
-  calico_controllers: ""
-  calico_ctl: "{{ rke.calico_ctl }}"
-  canal_node: "{{ rke.canal_node }}"
-  canal_cni: "{{ rke.canal_cni }}"
-  canal_flannel: "{{ rke.canal_flannel }}"
-  weave_node: "{{ rke.weave_node }}"
-  weave_cni: "{{ rke.weave_cni }}"
-  pod_infra_container: "{{ rke.pod_infra_container }}"
-  ingress: "{{ rke.ingress }}"
-  ingress_backend: "{{ rke.ingress_backend }}"
-  metrics_server: "{{ rke.metrics_server }}"
+system_images: {}
 ssh_key_path: "{{ cluster_config_dir }}/cluster_key"
 ssh_cert_path: ""
 ssh_agent_auth: false
@@ -128,7 +101,7 @@ authorization:
   mode: none
   options: {}
 ignore_docker_version: false
-kubernetes_version: ""
+kubernetes_version: {{ rke_kubernetes_version }}
 private_registries: []
 ingress:
   provider: ""
diff --git a/ansible/test/roles/prepare-docker-dind/defaults/main.yml b/ansible/test/roles/prepare-docker-dind/defaults/main.yml
index 147a828a..c42fcb82 100644
--- a/ansible/test/roles/prepare-docker-dind/defaults/main.yml
+++ b/ansible/test/roles/prepare-docker-dind/defaults/main.yml
@@ -2,4 +2,4 @@
 # Variable specifying if we should install docker, or only prepare for it
 start_docker: true
 #The version of docker to install
-docker_version: 18.09.5
+docker_version: 19.03.15
diff --git a/ansible/test/roles/prepare-kubectl/defaults/main.yml b/ansible/test/roles/prepare-kubectl/defaults/main.yml
index df32a1a4..fbba2476 100644
--- a/ansible/test/roles/prepare-kubectl/defaults/main.yml
+++ b/ansible/test/roles/prepare-kubectl/defaults/main.yml
@@ -4,4 +4,4 @@
 # cases where it is used by verification tests of other roles).
 kubectl_install: false
 # Kubectl version.
-kubectl_version: 1.15.11
+kubectl_version: 1.19.6
diff --git a/ansible/test/roles/prepare-kubectl/tasks/main.yml b/ansible/test/roles/prepare-kubectl/tasks/main.yml
index b5631850..f75b0d09 100644
--- a/ansible/test/roles/prepare-kubectl/tasks/main.yml
+++ b/ansible/test/roles/prepare-kubectl/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - name: "Install kubectl-{{ kubectl_version }}"
   get_url:
-    url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/linux/amd64/kubectl"
+    url: "https://dl.k8s.io/release/v{{ kubectl_version }}/bin/linux/amd64/kubectl"
     dest: "{{ '/usr/local/bin/kubectl' if kubectl_install else app_data_path+'/downloads/kubectl' }}"
     # This mode conditional allows checking if kubectl role, when installing kubectl, correctly
     # adds executable bit (bonus).
diff --git a/ansible/test/roles/prepare-package-repository/vars/main.yml b/ansible/test/roles/prepare-package-repository/vars/main.yml
index 195ad0f1..db725e80 100644
--- a/ansible/test/roles/prepare-package-repository/vars/main.yml
+++ b/ansible/test/roles/prepare-package-repository/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 pkg_dir: "{{ app_data_path }}/pkg/rpm"
 packages:
-- "docker-ce-18.09.5"
+- "docker-ce-19.03.15"
 - container-selinux
 - docker-ce-cli
 - containerd.io
diff --git a/ansible/test/roles/prepare-rke/defaults/main.yml b/ansible/test/roles/prepare-rke/defaults/main.yml
index 2cb05679..8a6749bb 100644
--- a/ansible/test/roles/prepare-rke/defaults/main.yml
+++ b/ansible/test/roles/prepare-rke/defaults/main.yml
@@ -1,5 +1,3 @@
 ---
 #The rke version.
-rke_version: 1.0.4
-#The kubectl version.
-kubectl_version: 1.15.11
+rke_version: 1.2.4
diff --git a/build/data_lists/infra_bin_utils.list b/build/data_lists/infra_bin_utils.list
index 3beb2972..24543acc 100644
--- a/build/data_lists/infra_bin_utils.list
+++ b/build/data_lists/infra_bin_utils.list
@@ -1,5 +1,5 @@
-https://storage.googleapis.com/kubernetes-release/release/v1.15.11/bin/linux/amd64/kubectl
+https://dl.k8s.io/release/v1.19.6/bin/linux/amd64/kubectl
 https://get.helm.sh/helm-v2.16.6-linux-amd64.tar.gz
 https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz
 https://github.com/chartmuseum/helm-push/releases/download/v0.9.0/helm-push_0.9.0_linux_amd64.tar.gz
-https://github.com/rancher/rke/releases/download/v1.0.4/rke_linux-amd64
+https://github.com/rancher/rke/releases/download/v1.2.4/rke_linux-amd64
diff --git a/build/data_lists/onap_deb.list b/build/data_lists/onap_deb.list
index c2ca342d..826f7abc 100644
--- a/build/data_lists/onap_deb.list
+++ b/build/data_lists/onap_deb.list
@@ -1,5 +1,5 @@
-docker-ce=5:18.09.5~3-0~ubuntu-bionic
-docker-ce-cli=5:18.09.5~3-0~ubuntu-bionic
+docker-ce=5:19.03.15~3-0~ubuntu-bionic
+docker-ce-cli=5:19.03.15~3-0~ubuntu-bionic
 containerd.io=1.2.2-3
 pigz
 libltdl7
diff --git a/build/data_lists/onap_rpm.list b/build/data_lists/onap_rpm.list
index a764c262..689d5772 100644
--- a/build/data_lists/onap_rpm.list
+++ b/build/data_lists/onap_rpm.list
@@ -2,8 +2,8 @@ audit-2.8.5-4.el7.x86_64
 bash-completion-2.1-8.el7.noarch
 containerd.io-1.2.5-3.1.el7.x86_64
 container-selinux-2.107-1.el7_6.noarch
-docker-ce-18.09.5-3.el7.x86_64
-docker-ce-cli-18.09.6-3.el7.x86_64
+docker-ce-19.03.15-3.el7.x86_64
+docker-ce-cli-19.03.15-3.el7.x86_64
 keyutils-1.5.8-3.el7.x86_64
 libbasicobjects-0.1.1-32.el7.x86_64
 libcollection-0.7.0-32.el7.x86_64
diff --git a/build/data_lists/rke_docker_images.list b/build/data_lists/rke_docker_images.list
index 2f1a1b32..9b0527a0 100644
--- a/build/data_lists/rke_docker_images.list
+++ b/build/data_lists/rke_docker_images.list
@@ -1,22 +1,14 @@
-rancher/calico-cni:v3.7.4
-rancher/calico-ctl:v2.0.0
-rancher/calico-kube-controllers:v3.7.4
-rancher/calico-node:v3.7.4
-rancher/calico-pod2daemon-flexvol:v3.10.2
-rancher/cluster-proportional-autoscaler:1.7.1
-rancher/coredns-coredns:1.6.2
-rancher/coreos-etcd:v3.3.10-rancher1
-rancher/coreos-flannel:v0.11.0
-rancher/coreos-flannel:v0.11.0-rancher1
-rancher/flannel-cni:v0.3.0-rancher5
-rancher/hyperkube:v1.15.9-rancher1
-rancher/k8s-dns-dnsmasq-nanny:1.15.0
-rancher/k8s-dns-kube-dns:1.15.0
-rancher/k8s-dns-sidecar:1.15.0
-rancher/metrics-server:v0.3.3
+rancher/calico-cni:v3.16.5
+rancher/calico-kube-controllers:v3.16.5
+rancher/calico-node:v3.16.5
+rancher/calico-pod2daemon-flexvol:v3.16.5
+rancher/cluster-proportional-autoscaler:1.8.1
+rancher/coredns-coredns:1.7.0
+rancher/coreos-etcd:v3.4.13-rancher1
+rancher/coreos-flannel:v0.13.0-rancher1
+rancher/hyperkube:v1.19.6-rancher1
+rancher/metrics-server:v0.3.6
 rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1
-rancher/nginx-ingress-controller:nginx-0.25.1-rancher1
-rancher/pause:3.1
-rancher/rke-tools:v0.1.52
-weaveworks/weave-kube:2.5.2
-weaveworks/weave-npc:2.5.2
+rancher/nginx-ingress-controller:nginx-0.35.0-rancher2
+rancher/pause:3.2
+rancher/rke-tools:v0.1.68
diff --git a/build/docker-entrypoint.sh b/build/docker-entrypoint.sh
index 81dcd84c..d6f526d3 100755
--- a/build/docker-entrypoint.sh
+++ b/build/docker-entrypoint.sh
@@ -164,12 +164,12 @@ case "$distro_type" in
         done
 
         # Download all packages via apt-get to repository folder
-        for i in $(cat ${list_file});do echo apt-get download $i -y; done
+        for i in $(cat ${list_file});do apt-get download $i -y; done
         for i in $(cat ${list_file});
             do
                 for depends in $(apt-cache depends $i | grep -E 'Depends' | grep -v 'Depends:.*>$' | cut -d ':' -f 2,3 | sed -e s/'<'/''/ -e s/'>'/''/);
                 do
-echo                    apt-get download $depends -y;
+                    apt-get download $depends -y;
                 done;
             done
 
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index e2215c11..fd788c84 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -61,7 +61,7 @@ Subsequent steps are the same on both platforms:
 ::
 
     # install following packages
-    yum install -y docker-ce-18.09.5 git createrepo expect nodejs npm jq
+    yum install -y docker-ce-19.03.15 git createrepo expect nodejs npm jq
 
     # install Python 3
     yum install -y python36 python36-pip