Ingress Nginx Integration

[infra/stack/kubernetes.git] / playbooks / roles / package / defaults / main.yaml

diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index b1270d0b4600013fbd0ebc3213dd2f8a117e6699..4a86caad31bbd467a4a86bfd81bb1578cbbb98c8 100644 (file)
--- 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
@@ -63,6 +66,13 @@ k8s_misc_images:
   - 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