Item: hitachienergy#894, Updated requirements (images for calico, can…

…al), and image-registry defaults
to-bar · Mar 9, 2020 · e678c39 · e678c39
1 parent 7103660
commit e678c39
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 4 deletions.
diff --git a/.../ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt b/.../ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt
@@ -200,4 +200,11 @@ k8s.gcr.io/kube-scheduler:v1.17.3
 k8s.gcr.io/kube-proxy:v1.17.3
 k8s.gcr.io/pause:3.1
 k8s.gcr.io/etcd:3.4.3-0
-k8s.gcr.io/coredns:1.6.5
+k8s.gcr.io/coredns:1.6.5
+calico/kube-controllers:v3.11.2
+calico/cni:v3.11.2
+calico/pod2daemon-flexvol:v3.11.2
+calico/node:v3.11.2
+calico/cni:v3.12.0
+calico/pod2daemon-flexvol:v3.12.0
+calico/node:v3.12.0
diff --git a/.../ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt b/.../ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt
@@ -197,4 +197,11 @@ k8s.gcr.io/kube-scheduler:v1.17.3
 k8s.gcr.io/kube-proxy:v1.17.3
 k8s.gcr.io/pause:3.1
 k8s.gcr.io/etcd:3.4.3-0
-k8s.gcr.io/coredns:1.6.5
+k8s.gcr.io/coredns:1.6.5
+calico/kube-controllers:v3.11.2
+calico/cni:v3.11.2
+calico/pod2daemon-flexvol:v3.11.2
+calico/node:v3.11.2
+calico/cni:v3.12.0
+calico/pod2daemon-flexvol:v3.12.0
+calico/node:v3.12.0
diff --git a/...ible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt b/...ible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt
@@ -222,4 +222,13 @@ k8s.gcr.io/kube-scheduler:v1.17.3
 k8s.gcr.io/kube-proxy:v1.17.3
 k8s.gcr.io/pause:3.1
 k8s.gcr.io/etcd:3.4.3-0
-k8s.gcr.io/coredns:1.6.5
+k8s.gcr.io/coredns:1.6.5
+calico/kube-controllers:v3.11.2
+calico/cni:v3.11.2
+calico/pod2daemon-flexvol:v3.11.2
+calico/node:v3.11.2
+calico/cni:v3.12.0
+calico/pod2daemon-flexvol:v3.12.0
+calico/node:v3.12.0
+
+
diff --git a/core/src/epicli/data/common/defaults/configuration/image-registry.yml b/core/src/epicli/data/common/defaults/configuration/image-registry.yml
@@ -90,4 +90,18 @@ specification:
     - name: "k8s.gcr.io/etcd:3.4.3-0"
       file_name: etcd-3.4.3-0.tar
     - name: "k8s.gcr.io/coredns:1.6.5"
-      file_name: coredns-1.6.5.tar
+      file_name: coredns-1.6.5.tar
+    - name: "calico/kube-controllers:v3.11.2"
+      file_name: kube-controllers-v3.11.2.tar
+    - name: "calico/cni:v3.11.2"
+      file_name: cni-v3.11.2.tar
+    - name: "calico/pod2daemon-flexvol:v3.11.2"
+      file_name: pod2daemon-flexvol-v3.11.2.tar
+    - name: "calico/node:v3.11.2"
+      file_name: node-v3.11.2.tar
+    - name: "calico/cni:v3.12.0" # for canal
+      file_name: cni-v3.12.0.tar
+    - name: "calico/pod2daemon-flexvol:v3.12.0" # for canal
+      file_name: pod2daemon-flexvol-v3.12.0.tar
+    - name: "calico/node:v3.12.0" # for canal
+      file_name: node-v3.12.0.tar