From 82f46dca26109cc620f8f606441fb306d588f978 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Tue, 9 May 2023 13:14:52 +0000 Subject: [PATCH] Uplift shipyard and airflow focal images This PS uplifts shipyard and airflow images based on focal. Also in this PS were updated manifests for deploying reduced-site gate: - memcached and ingress charts in openstack namespace were switched to be pulled from local artifactory instead of git - nfs-provisioner in nfs namespace was also switched to pull chart from local artifactory - removed *-htk chart dependency for the charts listed above Change-Id: Id212f1e99cc8bdcb5d46f31df18c70d941224150 --- .../nfs-provisioner.yaml | 2 -- .../openstack-ingress-controller/ingress.yaml | 25 -------------- .../osh/openstack-memcached/memcached.yaml | 27 +-------------- global/software/config/versions.yaml | 34 ++++++------------- site/airskiff/software/config/versions.yaml | 8 ++--- 5 files changed, 16 insertions(+), 80 deletions(-) diff --git a/global/software/charts/osh-infra/osh-infra-nfs-provisioner/nfs-provisioner.yaml b/global/software/charts/osh-infra/osh-infra-nfs-provisioner/nfs-provisioner.yaml index 516ac3ccb..cfa035080 100644 --- a/global/software/charts/osh-infra/osh-infra-nfs-provisioner/nfs-provisioner.yaml +++ b/global/software/charts/osh-infra/osh-infra-nfs-provisioner/nfs-provisioner.yaml @@ -34,6 +34,4 @@ data: values: storageclass: name: general - dependencies: - - osh-infra-helm-toolkit ... diff --git a/global/software/charts/osh/openstack-ingress-controller/ingress.yaml b/global/software/charts/osh/openstack-ingress-controller/ingress.yaml index 6683d97c2..609da346d 100644 --- a/global/software/charts/osh/openstack-ingress-controller/ingress.yaml +++ b/global/software/charts/osh/openstack-ingress-controller/ingress.yaml @@ -54,29 +54,4 @@ data: replicas: ingress: 2 error_page: 2 - dependencies: - - ingress-htk -... ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ingress-htk - layeringDefinition: - abstract: false - layer: global - storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/SoftwareVersions/v1 - name: software-versions - path: .charts.osh.ingress-htk - dest: - path: .source -data: - chart_name: ingress-htk - release: ingress-htk - namespace: ingress-htk - values: {} - dependencies: [] ... diff --git a/global/software/charts/osh/openstack-memcached/memcached.yaml b/global/software/charts/osh/openstack-memcached/memcached.yaml index 6b2fac9d9..0fbc2c3c2 100644 --- a/global/software/charts/osh/openstack-memcached/memcached.yaml +++ b/global/software/charts/osh/openstack-memcached/memcached.yaml @@ -55,29 +55,4 @@ data: server: node_selector_key: openstack-control-plane node_selector_value: enabled - dependencies: - - memcached-htk -... ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: memcached-htk - layeringDefinition: - abstract: false - layer: global - storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/SoftwareVersions/v1 - name: software-versions - path: .charts.osh.memcached-htk - dest: - path: .source -data: - chart_name: memcached-htk - release: memcached-htk - namespace: memcached-htk - values: {} - dependencies: [] -... +... \ No newline at end of file diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index a9361763d..b5eb58a6f 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -155,15 +155,9 @@ data: subpath: helm-toolkit type: git ingress: - location: https://opendev.org/openstack/openstack-helm-infra - reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60 + location: http://localhost:8282/ingress.tgz subpath: ingress - type: git - ingress-htk: - location: https://opendev.org/openstack/openstack-helm-infra - reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60 - subpath: helm-toolkit - type: git + type: tar keystone: location: https://opendev.org/openstack/openstack-helm reference: 536eaed62d55eca694eaae0c50df910dbb55fff7 @@ -195,15 +189,9 @@ data: subpath: helm-toolkit type: git memcached: - location: https://opendev.org/openstack/openstack-helm-infra - reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60 + location: http://localhost:8282/memcached.tgz subpath: memcached - type: git - memcached-htk: - location: https://opendev.org/openstack/openstack-helm-infra - reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60 - subpath: helm-toolkit - type: git + type: tar neutron: location: https://opendev.org/openstack/openstack-helm reference: 536eaed62d55eca694eaae0c50df910dbb55fff7 @@ -291,10 +279,9 @@ data: subpath: nagios type: git nfs_provisioner: - location: https://opendev.org/openstack/openstack-helm-infra - reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60 + location: http://localhost:8282/nfs-provisioner.tgz subpath: nfs-provisioner - type: git + type: tar podsecuritypolicy: location: https://opendev.org/openstack/openstack-helm-infra reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60 @@ -746,6 +733,7 @@ data: dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 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 neutron: bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -1013,15 +1001,15 @@ data: scripted_test: docker.io/library/rabbitmq:3.9.0-management image_repo_sync: docker.io/library/docker:17.07.0 shipyard: - airflow: quay.io/airshipit/airflow:latest-ubuntu_bionic - shipyard: quay.io/airshipit/shipyard:latest-ubuntu_bionic + airflow: quay.io/airshipit/airflow:latest-ubuntu_focal + shipyard: quay.io/airshipit/shipyard:latest-ubuntu_focal dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:14.5 shipyard_db_auxiliary: docker.io/postgres:14.5 - shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_bionic + shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_focal airflow_db_init: docker.io/postgres:14.5 rabbit_init: docker.io/library/rabbitmq:3.9.0-management - airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_bionic + airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_focal ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata diff --git a/site/airskiff/software/config/versions.yaml b/site/airskiff/software/config/versions.yaml index fbb924d7c..ecfb7001a 100644 --- a/site/airskiff/software/config/versions.yaml +++ b/site/airskiff/software/config/versions.yaml @@ -23,8 +23,8 @@ data: deckhand: deckhand: "quay.io/airshipit/deckhand:latest-ubuntu_focal" shipyard: - shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_bionic" - shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_bionic" - airflow: "quay.io/airshipit/airflow:latest-ubuntu_bionic" - airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_bionic" + shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_focal" + shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_focal" + airflow: "quay.io/airshipit/airflow:latest-ubuntu_focal" + airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_focal" ...