Code Review
/
infra
/
stack
/
kubernetes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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 04f5325e1781494f4044385af9e1cdd7101d6dad..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"
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:
# 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
k8s_binaries:
- calicoctl
@@
-41,6
+43,7
@@
k8s_binaries:
- kubeadm
- kubectl
- kubelet
- kubeadm
- kubectl
- kubelet
+ - calico_crds
k8s_misc_images:
- addon_resizer
k8s_misc_images:
- addon_resizer
@@
-59,11
+62,17
@@
k8s_misc_images:
- nodelocaldns
- pod_infra
- registry_proxy
- nodelocaldns
- pod_infra
- registry_proxy
- - tiller
- weave_kube
- weave_npc
other_images:
- 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
# ceph
ceph:
repo: ceph/ceph
@@
-80,6
+89,9
@@
other_images:
csi-provisioner:
repo: quay.io/k8scsi/csi-provisioner
tag: "{{ csi_provisioner_version }}"
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 }}"
csi-snapshotter:
repo: quay.io/k8scsi/csi-snapshotter
tag: "{{ csi_snapshotter_version }}"