X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=blobdiff_plain;f=playbooks%2Froles%2Fpackage%2Fdefaults%2Fmain.yaml;h=4a86caad31bbd467a4a86bfd81bb1578cbbb98c8;hp=136ae2b6171c469901963fb5fbf70ba8c9c56e4a;hb=41a4f979f0ed8add001aecb41b4b849c69841001;hpb=bfdd3d8ef9d2aa002bab69ebd36f971df3918146

diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index 136ae2b..4a86caa 100644
--- a/playbooks/roles/package/defaults/main.yaml
+++ b/playbooks/roles/package/defaults/main.yaml
@@ -26,14 +26,16 @@ containers_folder: "{{ offline_pkg_folder }}/containers"
 pip_folder: "{{ offline_pkg_folder }}/pip"
 
 helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz"
+dib_images_url: https://artifactory.nordix.org/artifactory/cloud-infra/dib
 
 # some images require architecture
 image_arch: amd64
 
 dib_images:
-  - https://artifactory.nordix.org/artifactory/cloud-infra/dib/deployment_image/ubuntu1804/deployment_image.qcow2
-  - https://artifactory.nordix.org/artifactory/cloud-infra/dib/ipa_image/coreos/ipa.initramfs
-  - https://artifactory.nordix.org/artifactory/cloud-infra/dib/ipa_image/coreos/ipa.kernel
+  - "{{ dib_images_url }}/ipa_image/coreos/ipa.initramfs"
+  - "{{ dib_images_url }}/ipa_image/coreos/ipa.kernel"
+
+dib_deployment_image: "{{ dib_images_url }}/deployment_image/ubuntu1804/deployment_image_{{ deployment_image_version }}.qcow2"
 
 k8s_binaries:
   - calicoctl
@@ -41,6 +43,7 @@ k8s_binaries:
   - kubeadm
   - kubectl
   - kubelet
+  - calico_crds
 
 k8s_misc_images:
   - addon_resizer
@@ -52,7 +55,6 @@ k8s_misc_images:
   - dnsautoscaler
   - etcd
   - flannel
-  - flannel_cni
   - helm
   - metrics_server
   - multus
@@ -60,11 +62,17 @@ k8s_misc_images:
   - nodelocaldns
   - pod_infra
   - registry_proxy
-  - tiller
   - weave_kube
   - weave_npc
 
 other_images:
+  # ingress
+  ingress-controller:
+    repo: "k8s.gcr.io/ingress-nginx/controller"
+    tag: "{{ ingress_nginx_version }}"
+  ingress-kube-webhook-certgen:
+    repo: k8s.gcr.io/ingress-nginx/kube-webhook-certgen
+    tag: "{{ ingress_nginx_version }}"
   # ceph
   ceph:
     repo: ceph/ceph
@@ -81,6 +89,9 @@ other_images:
   csi-provisioner:
     repo: quay.io/k8scsi/csi-provisioner
     tag: "{{ csi_provisioner_version }}"
+  csi-resizer:
+    repo: quay.io/k8scsi/csi-resizer
+    tag: "{{ csi_resizer_version }}"
   csi-snapshotter:
     repo: quay.io/k8scsi/csi-snapshotter
     tag: "{{ csi_snapshotter_version }}"
@@ -111,6 +122,9 @@ other_images:
   kube-state-metrics:
     repo: quay.io/coreos/kube-state-metrics
     tag: "{{ kube_state_metrics_version }}"
+  busybox:
+    repo: docker.io/library/busybox
+    tag: "{{ busybox_version }}"
 
 repositories:
   # NOTE (fdegir): OpenDev Git Repositories - Using Nordix Mirrors