airship/porthole
Code Issues Proposed changes

Pin MaxScale version to 6 series

Browse Source 
Newer versions of MaxScale are not compatible with
Ubuntu Jammy.

Also aded some fixes to align with osh-infra
recent updates.

Change-Id: I64a9bd5219122d0659ac241d87e1c6ce828eb8e8
This commit is contained in:
Sergiy Markin 2025-03-17 21:25:53 +00:00
parent 99a07ff007
commit 2d3e2028ad
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/mysqlclient-utility/Dockerfile.ubuntu_jammy
View File

@ -24,7 +24,7 @@ RUN set -xe \
gnupg \ gnupg \
curl \ curl \
&& curl -LsS -O https://downloads.mariadb.com/MariaDB/mariadb_repo_setup \ && curl -LsS -O https://downloads.mariadb.com/MariaDB/mariadb_repo_setup \
&& bash mariadb_repo_setup --mariadb-server-version=${MARIADB_VERSION} \ && bash mariadb_repo_setup --mariadb-server-version=${MARIADB_VERSION} --mariadb-maxscale-version=6 \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
bash \ bash \
@ -51,7 +51,7 @@ RUN set -xe \
&& sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf \ && sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \ && curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \ | tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& curl --silent -L https://downloads.percona.com/downloads/percona-toolkit/${PERCONA_TOOLKIT_VERSION}/binary/tarball/percona-toolkit-${PERCONA_TOOLKIT_VERSION}_$(arch).tar.gz \ && curl --silent -L https://downloads.percona.com/downloads/percona-toolkit/${PERCONA_TOOLKIT_VERSION}/binary/tarball/percona-toolkit-${PERCONA_TOOLKIT_VERSION}_x86_64.tar.gz \
| tar -zC /usr/local/bin/ --strip-components=2 --wildcards -x "*/*/pt-show-grants" \ | tar -zC /usr/local/bin/ --strip-components=2 --wildcards -x "*/*/pt-show-grants" \
&& curl -o /tmp/rclone.deb https://downloads.rclone.org/rclone-current-linux-amd64.deb \ && curl -o /tmp/rclone.deb https://downloads.rclone.org/rclone-current-linux-amd64.deb \
&& apt-get install -y --no-install-recommends /tmp/rclone.deb \ && apt-get install -y --no-install-recommends /tmp/rclone.deb \

2
tools/deployment/005-calicoctl-utility.sh
View File

@ -15,7 +15,7 @@ set -xe
namespace=utility namespace=utility
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY:="$(helm osh get-values-overrides calicoctl-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY:="$(helm osh get-values-overrides -c calicoctl-utility)"}
helm upgrade --install calicoctl-utility ./artifacts/calicoctl-utility.tgz --namespace=$namespace \ helm upgrade --install calicoctl-utility ./artifacts/calicoctl-utility.tgz --namespace=$namespace \
${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY} ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY}

4
tools/deployment/010-ceph-utility.sh
View File

@ -54,14 +54,14 @@ helm upgrade --install ceph-utility-config ./ceph-provisioners \
--namespace=$namespace \ --namespace=$namespace \
--values=/tmp/ceph-utility-config.yaml \ --values=/tmp/ceph-utility-config.yaml \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(helm osh get-values-overrides ceph-provisioners)} \ ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(helm osh get-values-overrides -c ceph-provisioners)} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE} ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
# Deploy Ceph-Utility # Deploy Ceph-Utility
cd ${CURRENT_DIR} cd ${CURRENT_DIR}
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_CEPH_UTILITY:="$(./tools/deployment/get-values-overrides.sh ceph-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_CEPH_UTILITY:="$(helm osh get-values-overrides -c ceph-utility)"}
helm upgrade --install ceph-utility ./artifacts/ceph-utility.tgz --namespace=$namespace \ helm upgrade --install ceph-utility ./artifacts/ceph-utility.tgz --namespace=$namespace \
${PORTHOLE_EXTRA_HELM_ARGS_CEPH_UTILITY} ${PORTHOLE_EXTRA_HELM_ARGS_CEPH_UTILITY}

2
tools/deployment/020-compute-utility.sh
View File

@ -16,7 +16,7 @@ set -xe
namespace="utility" namespace="utility"
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_COMPUTE_UTILITY:="$(./tools/deployment/get-values-overrides.sh compute-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_COMPUTE_UTILITY:="$(helm osh get-values-overrides -c compute-utility)"}
helm upgrade --install compute-utility ./artifacts/compute-utility.tgz --namespace=$namespace \ helm upgrade --install compute-utility ./artifacts/compute-utility.tgz --namespace=$namespace \
${PORTHOLE_EXTRA_HELM_ARGS_COMPUTE_UTILITY} ${PORTHOLE_EXTRA_HELM_ARGS_COMPUTE_UTILITY}

2
tools/deployment/030-etcdctl-utility.sh
View File

@ -15,7 +15,7 @@ set -xe
namespace="utility" namespace="utility"
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_ETCDCTL_UTILITY:="$(./tools/deployment/get-values-overrides.sh etcdctl-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_ETCDCTL_UTILITY:="$(helm osh get-values-overrides -c etcdctl-utility)"}
helm upgrade --install etcdctl-utility ./artifacts/etcdctl-utility.tgz --namespace=$namespace \ helm upgrade --install etcdctl-utility ./artifacts/etcdctl-utility.tgz --namespace=$namespace \
${PORTHOLE_EXTRA_HELM_ARGS_ETCDCTL_UTILITY} ${PORTHOLE_EXTRA_HELM_ARGS_ETCDCTL_UTILITY}

6
tools/deployment/040-mysqlclient-utility.sh
View File

@ -32,10 +32,10 @@ manifests:
EOF EOF
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides mariadb)"} : ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides -c mariadb)"}
#NOTE: Lint and package chart #NOTE: Lint and package chart
make -C "${HELM_CHART_ROOT_PATH}" mariadb make -C "${HELM_CHART_ROOT_PATH}" mariadb SKIP_CHANGELOG=1
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
@ -55,7 +55,7 @@ cd "${CURRENT_DIR}"
namespace="utility" namespace="utility"
export HELM_CHART_ROOT_PATH="${PORTHOLE_PATH:="../porthole/charts"}" export HELM_CHART_ROOT_PATH="${PORTHOLE_PATH:="../porthole/charts"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_MYSQLCLIENT_UTILITY:="$(./tools/deployment/get-values-overrides.sh mysqlclient-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_MYSQLCLIENT_UTILITY:="$(helm osh get-values-overrides -c mysqlclient-utility)"}
helm upgrade --install mysqlclient-utility ./artifacts/mysqlclient-utility.tgz --namespace=$namespace \ helm upgrade --install mysqlclient-utility ./artifacts/mysqlclient-utility.tgz --namespace=$namespace \
--set "conf.mariadb_backup_restore.enabled_namespaces=openstack" \ --set "conf.mariadb_backup_restore.enabled_namespaces=openstack" \

2
tools/deployment/050-openstack-utility.sh
View File

@ -15,7 +15,7 @@ set -xe
namespace="utility" namespace="utility"
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_OPENSTACK_UTILITY:="$(./tools/deployment/get-values-overrides.sh openstack-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_OPENSTACK_UTILITY:="$(helm osh get-values-overrides -c openstack-utility)"}
helm upgrade --install openstack-utility ./artifacts/openstack-utility.tgz --namespace=$namespace \ helm upgrade --install openstack-utility ./artifacts/openstack-utility.tgz --namespace=$namespace \
${PORTHOLE_EXTRA_HELM_ARGS_OPENSTACK_UTILITY} ${PORTHOLE_EXTRA_HELM_ARGS_OPENSTACK_UTILITY}

7
tools/deployment/060-postgresql-utility.sh
View File

@ -20,11 +20,11 @@ cd "${OSH_INFRA_PATH}"
# bash -c "./tools/deployment/common/postgresql.sh" # bash -c "./tools/deployment/common/postgresql.sh"
#NOTE: Lint and package chart #NOTE: Lint and package chart
make postgresql make postgresql SKIP_CHANGELOG=1
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides postgresql)"} : ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides -c postgresql)"}
helm upgrade --install postgresql ./postgresql \ helm upgrade --install postgresql ./postgresql \
--namespace=osh-infra \ --namespace=osh-infra \
@ -38,14 +38,13 @@ helm upgrade --install postgresql ./postgresql \
#NOTE: Wait for deploy #NOTE: Wait for deploy
helm osh wait-for-pods osh-infra helm osh wait-for-pods osh-infra
bash -c "./tools/deployment/common/ingress.sh"
# Deploy postgresql-utility # Deploy postgresql-utility
cd ${CURRENT_DIR} cd ${CURRENT_DIR}
namespace="utility" namespace="utility"
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}" export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_POSTGRESQL_UTILITY:="$(./tools/deployment/get-values-overrides.sh postgresql-utility)"} : ${PORTHOLE_EXTRA_HELM_ARGS_POSTGRESQL_UTILITY:="$(./tools/deployment/get-values-overrides.sh -c postgresql-utility)"}
helm upgrade --install postgresql-utility ./artifacts/postgresql-utility.tgz --namespace=$namespace \ helm upgrade --install postgresql-utility ./artifacts/postgresql-utility.tgz --namespace=$namespace \
--set "conf.postgresql_backup_restore.enabled_namespaces=osh-infra" \ --set "conf.postgresql_backup_restore.enabled_namespaces=osh-infra" \

4
zuul.d/postgresql-utility.yaml
View File

@ -46,6 +46,10 @@
parent: airship-porthole-images-build-postgresql-utility parent: airship-porthole-images-build-postgresql-utility
vars: vars:
distro_suffix: ubuntu_jammy distro_suffix: ubuntu_jammy
ingress_setup: true
ingress_openstack_setup: false
ingress_ceph_setup: false
ingress_osh_infra_setup: true
- job: - job:
name: airship-porthole-images-jammy-publish-postgresql-utility name: airship-porthole-images-jammy-publish-postgresql-utility