diff --git a/.zuul.yaml b/.zuul.yaml index f973c7e74..1a59494c2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -77,6 +77,18 @@ nodes: - node-1 - node-2 + - name: k8s_cluster + nodes: + - primary + - node-1 + - node-2 + - name: k8s_control_plane + nodes: + - primary + - name: k8s_nodes + nodes: + - node-1 + - node-2 - nodeset: @@ -88,6 +100,12 @@ - name: primary nodes: - primary + - name: k8s_cluster + nodes: + - primary + - name: k8s_control_plane + nodes: + - primary - job: @@ -156,9 +174,9 @@ vars: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz - HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 + HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 gate_scripts_relative_path: . gate_scripts: - ./tools/deployment/airskiff/developer/000-prepare-k8s.sh @@ -184,9 +202,9 @@ vars: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz - HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 + HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 DISTRO: ubuntu_focal gate_scripts_relative_path: . gate_scripts: @@ -215,9 +233,9 @@ vars: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz - HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 + HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 USE_ARMADA_GO: true gate_scripts_relative_path: . gate_scripts: @@ -363,9 +381,9 @@ vars: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz - HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f - OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 + HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 + OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 irrelevant-files: - ^.*\.rst$ - ^doc/.*$ diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index 8f1cc1e36..243ca6fca 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -405,7 +405,7 @@ data: calico_kube_controllers: quay.io/calico/kube-controllers:v3.4.0 calico_node: quay.io/calico/node:v3.4.0 calico_settings: docker.io/calico/ctl:v3.4.0 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal etcd: etcd: quay.io/coreos/etcd:v3.5.11 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" @@ -416,22 +416,22 @@ data: ceph_mds: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_mgr: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_rbd_pool: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ceph-mon: ceph_bootstrap: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_mon: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_mon_check: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ceph-osd: ceph_bootstrap: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_osd: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ceph-provisioners: ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_rgw: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial @@ -439,7 +439,7 @@ data: ceph-rgw: ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial ceph_rgw: docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial @@ -450,22 +450,22 @@ data: ceph_mds: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_mgr: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_rbd_pool: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal tenant-ceph-mon: ceph_bootstrap: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_mon: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_mon_check: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal tenant-ceph-osd: ceph_bootstrap: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_osd: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal tenant-ceph-provisioners: ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_rgw: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial @@ -473,7 +473,7 @@ data: tenant-ceph-rgw: ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 ceph_rgw: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial @@ -482,7 +482,7 @@ data: apiserver: anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3 apiserver: gcr.io/google-containers/hyperkube-amd64:v1.17.3 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal key_rotate: gcr.io/google-containers/hyperkube-amd64:v1.17.3 controller-manager: anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3 @@ -518,7 +518,7 @@ data: bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -536,7 +536,7 @@ data: cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -548,7 +548,7 @@ data: cirros_image: https://raw.githubusercontent.com/jasvinder1107/cirros-mirror/master/0.3.5/cirros-0.3.5-x86_64-disk.img db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal glance_api: docker.io/openstackhelm/glance:ocata-ubuntu_xenial glance_db_sync: docker.io/openstackhelm/glance:ocata-ubuntu_xenial glance_metadefs_load: docker.io/openstackhelm/glance:ocata-ubuntu_xenial @@ -563,7 +563,7 @@ data: bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal heat_api: docker.io/openstackhelm/heat:ocata-ubuntu_xenial heat_cfn: docker.io/openstackhelm/heat:ocata-ubuntu_xenial heat_cloudwatch: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -579,7 +579,7 @@ data: horizon: db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal horizon: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial-20200513 horizon_db_sync: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial-20200513 test: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic @@ -602,10 +602,10 @@ data: keystone_credential_cleanup: docker.io/openstackhelm/heat:wallaby-ubuntu_focal keystone_api: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal keystone_domain_manage: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/docker:17.07.0 libvirt: - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903 mariadb: mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal @@ -614,13 +614,13 @@ data: prometheus_create_mysql_user: docker.io/library/mariadb:10.6.14-focal prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1 prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415 memcached: - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal memcached: docker.io/library/memcached:1.5.5 prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1 image_repo_sync: docker.io/library/docker:17.07.0 @@ -628,7 +628,7 @@ data: bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -651,7 +651,7 @@ data: bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_service: docker.io/openstackhelm/heat:ocata-ubuntu_xenial ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -674,7 +674,7 @@ data: rabbit_init: docker.io/library/rabbitmq:3.10.18-management test: docker.io/xrally/xrally-openstack:1.3.0 openvswitch: - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal openvswitch_db_server: docker.io/openstackhelm/openvswitch:ubuntu_bionic-20191031 openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:ubuntu_bionic-20191031 rabbitmq: @@ -682,11 +682,11 @@ data: prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:stein-ubuntu_bionic rabbitmq_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic rabbitmq: docker.io/library/rabbitmq:3.10.18 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal scripted_test: docker.io/library/rabbitmq:3.10.18-management image_repo_sync: docker.io/library/docker:17.07.0 tempest: - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal tempest_run_tests: docker.io/openstackhelm/tempest:latest-ubuntu_focal ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal image_repo_sync: docker.io/docker:17.07.0 @@ -701,23 +701,23 @@ data: s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124 helm_tests: docker.io/openstackhelm/elasticsearch-s3:latest-7_6_2 prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.1.0 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124 elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-7_6_2 image_repo_sync: docker.io/library/docker:17.07.0 fluentbit: fluentbit: docker.io/fluent/fluent-bit:0.14.2 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 fluentd: fluentd: docker.io/openstackhelm/fluentd:latest-debian - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 grafana: grafana: docker.io/grafana/grafana:9.2.10 mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic grafana_db_session_sync: docker.io/openstackhelm/heat:stein-ubuntu_bionic selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic @@ -725,7 +725,7 @@ data: kibana: apache_proxy: docker.io/library/httpd:2.4 kibana: docker.elastic.co/kibana/kibana-oss:7.1.0 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 register_kibana_indexes: docker.io/openstackhelm/heat:wallaby-ubuntu_focal flush_kibana_metadata: docker.io/openstackhelm/heat:wallaby-ubuntu_focal @@ -737,40 +737,40 @@ data: image_repo_sync: docker.io/library/docker:17.07.0 nfs_provisioner: nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v2.3.0 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 prometheus: apache_proxy: docker.io/library/httpd:2.4 prometheus: docker.io/prom/prometheus:v2.25.0 helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 prometheus_alertmanager: apache_proxy: docker.io/library/httpd:2.4 prometheus-alertmanager: docker.io/prom/alertmanager:v0.20.0 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 prometheus_kube_state_metrics: kube_state_metrics: quay.io/coreos/kube-state-metrics:v2.0.0-alpha.1 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 prometheus_node_exporter: node_exporter: docker.io/prom/node-exporter:v0.18.1 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 prometheus_openstack_exporter: prometheus_openstack_exporter: docker.io/openstackhelm/prometheus-openstack-exporter:latest-ubuntu_bionic - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic prometheus_process_exporter: process_exporter: docker.io/ncabatoff/process-exporter:0.2.11 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 ucp: armada: api: quay.io/airshipit/armada:latest-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal helm: docker.io/lachlanevenson/k8s-helm:v2.16.9 ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton @@ -781,7 +781,7 @@ data: api: quay.io/airshipit/armada-go:latest-ubuntu_focal go: quay.io/airshipit/armada-go:latest-ubuntu_focal operator: quay.io/airshipit/armada-operator:latest-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal helm: docker.io/lachlanevenson/k8s-helm:v2.16.9 ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton @@ -791,7 +791,7 @@ data: tiller: ghcr.io/helm/tiller:v2.17.0 barbican: bootstrap: docker.io/openstackhelm/heat:wallaby-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal scripted_test: docker.io/openstackhelm/heat:wallaby-ubuntu_focal db_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal barbican_db_sync: docker.io/openstackhelm/barbican:wallaby-ubuntu_focal @@ -806,7 +806,7 @@ data: db_init: docker.io/library/postgres:14.8 db_sync: quay.io/airshipit/deckhand:latest-ubuntu_focal deckhand: quay.io/airshipit/deckhand:latest-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton @@ -814,7 +814,7 @@ data: divingbell: docker.io/library/ubuntu:20.04 drydock: drydock: quay.io/airshipit/drydock:latest-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_user: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton @@ -840,7 +840,7 @@ data: keystone_credential_cleanup: docker.io/openstackhelm/heat:wallaby-ubuntu_focal keystone_api: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal keystone_domain_manage: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/docker:17.07.0 maas: db_init: docker.io/library/postgres:14.8 @@ -862,13 +862,13 @@ data: prometheus_create_mysql_user: docker.io/library/mariadb:10.6.14-focal prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1 prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415 memcached: - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal memcached: docker.io/library/memcached:1.5.5 prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1 image_repo_sync: docker.io/library/docker:17.07.0 @@ -876,7 +876,7 @@ data: pegleg: quay.io/airshipit/pegleg:latest-ubuntu_focal postgresql: postgresql: docker.io/library/postgres:14.8 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic prometheus_postgresql_exporter: docker.io/wrouesnel/postgres_exporter:v0.4.6 @@ -895,7 +895,7 @@ data: prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:stein-ubuntu_bionic rabbitmq_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic rabbitmq: docker.io/library/rabbitmq:3.10.18 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal scripted_test: docker.io/library/rabbitmq:3.10.18-management image_repo_sync: docker.io/library/docker:17.07.0 shipyard: diff --git a/tools/deployment/airskiff/developer/000-clone-dependencies.sh b/tools/deployment/airskiff/developer/000-clone-dependencies.sh index 73762a9a7..31e2f0df3 100755 --- a/tools/deployment/airskiff/developer/000-clone-dependencies.sh +++ b/tools/deployment/airskiff/developer/000-clone-dependencies.sh @@ -18,8 +18,8 @@ set -xe : "${INSTALL_PATH:="../"}" -: "${OSH_COMMIT:="2d9457e34ca4200ed631466bd87569b0214c92e7"}" -: "${OSH_INFRA_COMMIT:="cfff60ec10a6c386f38db79bb9f59a552c2b032f"}" +: "${OSH_COMMIT:="176b412072969f982386db9560b6f50fcb7e0148"}" +: "${OSH_INFRA_COMMIT:="6ca83be78013446540b68fd28d0a75d5b2329f40"}" : "${CLONE_ARMADA:=true}" : "${CLONE_ARMADA_GO:=true}" : "${CLONE_ARMADA_OPERATOR:=true}" @@ -27,6 +27,7 @@ set -xe : "${CLONE_SHIPYARD:=true}" : "${CLONE_PORTHOLE:=true}" : "${CLONE_PROMENADE:=true}" +: "${CLONE_KUBERNETES_ENTRYPOINT:=true}" : "${CLONE_MAAS:=true}" : "${CLONE_OSH:=true}" @@ -37,6 +38,7 @@ CLONE_DECKHAND=$(echo "$CLONE_DECKHAND" | tr '[:upper:]' '[:lower:]') CLONE_SHIPYARD=$(echo "$CLONE_SHIPYARD" | tr '[:upper:]' '[:lower:]') CLONE_PORTHOLE=$(echo "$CLONE_PORTHOLE" | tr '[:upper:]' '[:lower:]') CLONE_PROMENADE=$(echo "$CLONE_PROMENADE" | tr '[:upper:]' '[:lower:]') +CLONE_KUBERNETES_ENTRYPOINT=$(echo "$CLONE_KUBERNETES_ENTRYPOINT" | tr '[:upper:]' '[:lower:]') CLONE_MAAS=$(echo "$CLONE_MAAS" | tr '[:upper:]' '[:lower:]') CLONE_OSH=$(echo "$CLONE_OSH" | tr '[:upper:]' '[:lower:]') @@ -47,6 +49,7 @@ export CLONE_DECKHAND export CLONE_SHIPYARD export CLONE_PORTHOLE export CLONE_PROMENADE +export CLONE_KUBERNETES_ENTRYPOINT export CLONE_MAAS export CLONE_OSH @@ -71,6 +74,9 @@ fi if [[ ${CLONE_PROMENADE} = true ]] ; then git clone https://opendev.org/airship/promenade.git fi +if [[ ${CLONE_KUBERNETES_ENTRYPOINT} = true ]] ; then + git clone https://opendev.org/airship/kubernetes-entrypoint.git +fi # Clone dependencies diff --git a/tools/deployment/airskiff/developer/000-prepare-k8s.sh b/tools/deployment/airskiff/developer/000-prepare-k8s.sh index f847f403d..0d68e9569 100755 --- a/tools/deployment/airskiff/developer/000-prepare-k8s.sh +++ b/tools/deployment/airskiff/developer/000-prepare-k8s.sh @@ -45,13 +45,27 @@ EOF kubectl apply -f /tmp/${NAMESPACE}-ns.yaml done +# DNS resolve temp fix +cat << EOF | sudo tee /etc/resolv.conf > /dev/null +nameserver 10.96.0.10 +nameserver 8.8.8.8 +nameserver 8.8.4.4 +search svc.cluster.local cluster.local +options ndots:5 timeout:1 attempts:1 +EOF +# CoreDNS version upgrade +kubectl set image deployment coredns -n kube-system "coredns=registry.k8s.io/coredns/coredns:${COREDNS_VERSION}" +kubectl rollout restart -n kube-system deployment/coredns +kubectl rollout status --watch --timeout=300s -n kube-system deployment/coredns + + +# Add control-plane.minikube.internal host resord into CodeDNS PATCH=$(mktemp) HOSTIP=$(hostname -I| awk '{print $1}') -kubectl get configmap coredns -n kube-system -o json | jq -r "{data: .data}" | sed 's/ready\\n/header \{\\n response set ra\\n \}\\n ready\\n/g' > "${PATCH}" -sed -i "s;forward . /etc/resolv.conf {\\\n max_concurrent 1000\\\n }\\\n;forward . /etc/resolv.conf {\\\n max_concurrent 1000\\\n }\\\n hosts {\\\n $HOSTIP control-plane.minikube.internal\\\n fallthrough\\\n }\\\n;" "${PATCH}" +kubectl get configmap coredns -n kube-system -o json | jq -r "{data: .data}" > "${PATCH}" +sed -i "s;forward . /etc/resolv.conf {\\\n max_concurrent 1000\\\n }\\\n;forward . /etc/resolv.conf {\\\n }\\\n hosts {\\\n $HOSTIP control-plane.minikube.internal\\\n fallthrough\\\n }\\\n;" "${PATCH}" kubectl patch configmap coredns -n kube-system --patch-file "${PATCH}" -kubectl set image deployment coredns -n kube-system "coredns=registry.k8s.io/coredns/coredns:${COREDNS_VERSION}" rm -f "${PATCH}" kubectl rollout restart -n kube-system deployment/coredns kubectl rollout status --watch --timeout=300s -n kube-system deployment/coredns @@ -60,7 +74,6 @@ host -v control-plane.minikube.internal kubectl label nodes --all --overwrite ucp-control-plane=enabled - kubectl run multitool --image=praqma/network-multitool kubectl wait --for=condition=ready pod multitool --timeout=300s kubectl exec -it multitool -- nslookup control-plane.minikube.internal diff --git a/tools/deployment/airskiff/developer/015-make-all-charts.sh b/tools/deployment/airskiff/developer/015-make-all-charts.sh index 2dd76a0e9..1d5936a3d 100755 --- a/tools/deployment/airskiff/developer/015-make-all-charts.sh +++ b/tools/deployment/airskiff/developer/015-make-all-charts.sh @@ -20,7 +20,7 @@ set -xe CURRENT_DIR="$(pwd)" : "${INSTALL_PATH:="../"}" : "${ARTIFACTS_PATH:="../artifacts"}" -: "${HTK_COMMIT:="cfff60ec10a6c386f38db79bb9f59a552c2b032f"}" +: "${HTK_COMMIT:="6ca83be78013446540b68fd28d0a75d5b2329f40"}" : "${MAKE_CHARTS_OPENSTACK_HELM:=true}" : "${MAKE_CHARTS_OSH_INFRA:=true}" : "${MAKE_CHARTS_ARMADA:=true}" diff --git a/tools/deployment/airskiff/developer/017-make-all-images.sh b/tools/deployment/airskiff/developer/017-make-all-images.sh index b6a93d074..de39cbe3a 100755 --- a/tools/deployment/airskiff/developer/017-make-all-images.sh +++ b/tools/deployment/airskiff/developer/017-make-all-images.sh @@ -28,6 +28,7 @@ CURRENT_DIR="$(pwd)" : "${MAKE_SHIPYARD_IMAGES:=false}" : "${MAKE_PORTHOLE_IMAGES:=false}" : "${MAKE_PROMENADE_IMAGES:=false}" +: "${MAKE_KUBERTENES_ENTRYPOINT_IMAGES:=false}" # Convert both values to lowercase (or uppercase) MAKE_ARMADA_IMAGES=$(echo "$MAKE_ARMADA_IMAGES" | tr '[:upper:]' '[:lower:]') @@ -37,6 +38,7 @@ MAKE_DECKHAND_IMAGES=$(echo "$MAKE_DECKHAND_IMAGES" | tr '[:upper:]' '[:lower:]' MAKE_SHIPYARD_IMAGES=$(echo "$MAKE_SHIPYARD_IMAGES" | tr '[:upper:]' '[:lower:]') MAKE_PORTHOLE_IMAGES=$(echo "$MAKE_PORTHOLE_IMAGES" | tr '[:upper:]' '[:lower:]') MAKE_PROMENADE_IMAGES=$(echo "$MAKE_PROMENADE_IMAGES" | tr '[:upper:]' '[:lower:]') +MAKE_KUBERTENES_ENTRYPOINT_IMAGES=$(echo "$MAKE_KUBERTENES_ENTRYPOINT_IMAGES" | tr '[:upper:]' '[:lower:]') export MAKE_ARMADA_IMAGES export MAKE_ARMADA_GO_IMAGES @@ -45,6 +47,7 @@ export MAKE_DECKHAND_IMAGES export MAKE_SHIPYARD_IMAGES export MAKE_PORTHOLE_IMAGES export MAKE_PROMENADE_IMAGES +export MAKE_KUBERTENES_ENTRYPOINT_IMAGES cd "${INSTALL_PATH}" @@ -130,6 +133,15 @@ if [[ ${MAKE_PROMENADE_IMAGES} = true ]] ; then sed -i "s#quay.io/airshipit/promenade:latest-${DISTRO}#${DOCKER_REGISTRY}/airshipit/promenade:latest-${DISTRO}#g" ./global/software/config/versions.yaml popd fi +if [[ ${MAKE_KUBERTENES_ENTRYPOINT_IMAGES} = true ]] ; then + pushd kubernetes-entrypoint + make images + docker push "${DOCKER_REGISTRY}/airshipit/kubernetes-entrypoint:latest-${DISTRO}" + popd + pushd treasuremap + sed -i "s#quay.io/airshipit/kubernetes-entrypoint:latest-${DISTRO}#${DOCKER_REGISTRY}/airshipit/kubernetes-entrypoint:latest-${DISTRO}#g" ./global/software/config/versions.yaml + popd +fi docker images cd "${CURRENT_DIR}" diff --git a/tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml b/tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml index 7c0841487..41673e3a1 100644 --- a/tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml +++ b/tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml @@ -20,9 +20,9 @@ osh_params: # feature_gates: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz -HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 +HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 +OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 +OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 COREDNS_VERSION: v1.11.1 DISTRO: ubuntu_focal DOCKER_REGISTRY: quay.io @@ -42,5 +42,6 @@ MAKE_DECKHAND_IMAGES: false MAKE_SHIPYARD_IMAGES: false MAKE_PORTHOLE_IMAGES: false MAKE_PROMENADE_IMAGES: false +MAKE_KUBERTENES_ENTRYPOINT_IMAGES: false USE_ARMADA_GO: false ... diff --git a/tools/gate/playbooks/roles/airship-run-script-set/tasks/main.yaml b/tools/gate/playbooks/roles/airship-run-script-set/tasks/main.yaml index de28e39b7..23cef1b86 100644 --- a/tools/gate/playbooks/roles/airship-run-script-set/tasks/main.yaml +++ b/tools/gate/playbooks/roles/airship-run-script-set/tasks/main.yaml @@ -36,9 +36,9 @@ RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz') }}" - HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" + HTK_COMMIT: "{{ HTK_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" + OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" + OSH_COMMIT: "{{ OSH_COMMIT | default('176b412072969f982386db9560b6f50fcb7e0148') }}" COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}" DISTRO: "{{ DISTRO | default('ubuntu_focal') }}" DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}" @@ -58,6 +58,7 @@ MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}" MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}" MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}" + MAKE_KUBERTENES_ENTRYPOINT_IMAGES: "{{ MAKE_KUBERTENES_ENTRYPOINT_IMAGES | default('false') }}" USE_ARMADA_GO: "{{ USE_ARMADA_GO | default('false') }}" # NOTE(aostapenko) using bigger than async_status timeout due to async_status issue with # not recognizing timed out jobs: https://github.com/ansible/ansible/issues/25637 diff --git a/tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml b/tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml index d6dff60a0..5ab1aa382 100644 --- a/tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml +++ b/tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml @@ -20,9 +20,9 @@ osh_params: # feature_gates: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz -HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 +HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 +OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 +OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 COREDNS_VERSION: v1.11.1 DISTRO: ubuntu_focal DOCKER_REGISTRY: quay.io @@ -43,5 +43,6 @@ MAKE_DECKHAND_IMAGES: false MAKE_SHIPYARD_IMAGES: false MAKE_PORTHOLE_IMAGES: false MAKE_PROMENADE_IMAGES: false +MAKE_KUBERTENES_ENTRYPOINT_IMAGES: false USE_ARMADA_GO: false ... diff --git a/tools/gate/playbooks/roles/airship-run-script/tasks/main.yaml b/tools/gate/playbooks/roles/airship-run-script/tasks/main.yaml index 811319b82..132a98139 100644 --- a/tools/gate/playbooks/roles/airship-run-script/tasks/main.yaml +++ b/tools/gate/playbooks/roles/airship-run-script/tasks/main.yaml @@ -33,9 +33,9 @@ RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz') }}" - HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" + HTK_COMMIT: "{{ HTK_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" + OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" + OSH_COMMIT: "{{ OSH_COMMIT | default('176b412072969f982386db9560b6f50fcb7e0148') }}" COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}" DISTRO: "{{ DISTRO | default('ubuntu_focal') }}" DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}" @@ -55,5 +55,6 @@ MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}" MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}" MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}" + MAKE_KUBERTENES_ENTRYPOINT_IMAGES: "{{ MAKE_KUBERTENES_ENTRYPOINT_IMAGES | default('false') }}" USE_ARMADA_GO: "{{ USE_ARMADA_GO | default('false') }}" ...