From 35733a415119599221e322f31ce2eacd9f710fed Mon Sep 17 00:00:00 2001 From: varagini karthik Date: Tue, 19 Nov 2019 22:16:25 +0530 Subject: [PATCH] Integrate postgresql utility container in airship/treasuremap Postgresql utility container will be used by operations team to perform operation on postgresql server. Change-Id: Ie24886fee74c75b7f4a4a9cf6640249912aa8e47 --- .../schemas/pegleg/SoftwareVersions/v1.yaml | 54 ++++++++---- .../charts/utilities/chart-group.yaml | 3 +- .../charts/utilities/postgresql-utility.yaml | 84 +++++++++++++++++++ global/software/config/versions.yaml | 26 ++++-- 4 files changed, 142 insertions(+), 25 deletions(-) create mode 100644 global/software/charts/utilities/postgresql-utility.yaml diff --git a/global/schemas/pegleg/SoftwareVersions/v1.yaml b/global/schemas/pegleg/SoftwareVersions/v1.yaml index 66d81fa5b..f75d4fb00 100644 --- a/global/schemas/pegleg/SoftwareVersions/v1.yaml +++ b/global/schemas/pegleg/SoftwareVersions/v1.yaml @@ -828,17 +828,6 @@ data: type: string reference: type: string - openstack-utility: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string mysqlclient-utility: type: object properties: @@ -850,6 +839,28 @@ data: type: string reference: type: string + openstack-utility: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + postgresql-utility: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string files: type: object properties: @@ -1079,13 +1090,6 @@ data: type: string image_repo_sync: type: string - openstack-utility: - type: object - properties: - openstack-utility: - type: string - image_repo_sync: - type: string mysqlclient-utility: type: object properties: @@ -1093,6 +1097,20 @@ data: type: string image_repo_sync: type: string + openstack-utility: + type: object + properties: + openstack_utility: + type: string + image_repo_sync: + type: string + postgresql-utility: + type: object + properties: + postgresql_utility: + type: string + image_repo_sync: + type: string ceph: type: object properties: diff --git a/global/software/charts/utilities/chart-group.yaml b/global/software/charts/utilities/chart-group.yaml index 97624802d..559525a9d 100644 --- a/global/software/charts/utilities/chart-group.yaml +++ b/global/software/charts/utilities/chart-group.yaml @@ -16,5 +16,6 @@ data: # - ceph-utility - compute-utility - etcdctl-utility - - openstack-utility - mysqlclient-utility + - openstack-utility + - postgresql-utility diff --git a/global/software/charts/utilities/postgresql-utility.yaml b/global/software/charts/utilities/postgresql-utility.yaml new file mode 100644 index 000000000..6721e9f51 --- /dev/null +++ b/global/software/charts/utilities/postgresql-utility.yaml @@ -0,0 +1,84 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: postgresql-utility + layeringDefinition: + abstract: false + layer: global + labels: + name: postgresql-utility + storagePolicy: cleartext + substitutions: + # Chart source + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .charts.utility.postgresql-utility + dest: + path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.utility.postgresql-utility + dest: + path: .values.images.tags + # CAs + - + src: + schema: deckhand/Passphrase/v1 + name: ucp_postgres_admin_password + path: . + dest: + path: .values.secrets.postgresql.admin +data: + chart_name: postgresql-utility + release: postgresql-utility + namespace: utility + protected: + continue_processing: true + wait: + timeout: 600 + labels: + release_group: airship-postgresql-utility + install: + no_hooks: false + upgrade: + no_hooks: false + values: + labels: + utility: + node_selector_key: utility + node_selector_value: enabled + manifests: + configmap_bin: true + configmap_etc_client: true + configmap_etc_sudoers: true + deployment_utility: true + dependencies: + - postgresql-utility-htk +... +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: postgresql-utility-htk + layeringDefinition: + abstract: false + layer: global + storagePolicy: cleartext + substitutions: + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .charts.utility.postgresql-utility-htk + dest: + path: .source +data: + chart_name: postgresql-utility-htk + release: postgresql-utility-htk + namespace: postgresql-utility-htk + values: {} + dependencies: [] +... diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index b190d3b65..0e3a988ed 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -602,6 +602,17 @@ data: reference: 03580ec90afa162c166661acf27f351b83565375 subpath: helm-toolkit type: git + postgresql-utility: + location: https://opendev.org/airship/porthole + reference: 0546a3aff7af4541e07630589a15a3d172c8ff5c + subpath: charts/postgresql-utility + type: git + postgresql-utility-htk: + location: https://opendev.org/openstack/openstack-helm-infra + reference: 03580ec90afa162c166661acf27f351b83565375 + subpath: helm-toolkit + type: git + images: calico: calico: @@ -1089,23 +1100,26 @@ data: shipyard_db_sync: quay.io/airshipit/shipyard:72ca47e5c9ae8b7b1dcccd7742be6499f0411650-ubuntu_xenial utility: calicoctl-utility: - calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-alpine + calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic image_repo_sync: docker.io/docker:18.09.02 ceph-utility: - ceph_utility: quay.io/airshipit/porthole-ceph-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial + ceph_utility: quay.io/airshipit/porthole-ceph-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic image_repo_sync: docker.io/docker:18.09.02 compute-utility: - compute_utility: quay.io/airshipit/porthole-compute-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial + compute_utility: quay.io/airshipit/porthole-compute-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic image_repo_sync: docker.io/docker:18.09.02 etcdctl-utility: - etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial + etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic image_repo_sync: docker.io/docker:18.09.02 mysqlclient-utility: image_repo_sync: docker.io/docker:18.09.02 - mysqlclient_utility: quay.io/airshipit/porthole-mysqlclient-utility:f165082caf47cc3cc487138081589a373a36ac36-ubuntu_xenial + mysqlclient_utility: quay.io/airshipit/porthole-mysqlclient-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic openstack-utility: image_repo_sync: docker.io/docker:18.09.02 - openstack-utility: quay.io/airshipit/porthole-openstack-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial + openstack-utility: quay.io/airshipit/porthole-openstack-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic + postgresql-utility: + postgresql_utility: quay.io/airshipit/porthole-postgresql-utility:744e4bb10acccaa8722f9e05fb0a39a1b5b35731-ubuntu_bionic + image_repo_sync: docker.io/docker:18.09.02 packages: gpgkey: |- -----BEGIN PGP PUBLIC KEY BLOCK-----