From 4e6155c21d140213f70c3e50d06962f1eea7ea70 Mon Sep 17 00:00:00 2001 From: "Kavva, Jagan Mohan (jk330k)" Date: Thu, 5 Sep 2019 12:45:21 -0500 Subject: [PATCH] Integrate etcdctl utility container in airship/treasuremap This etcdctl utility container will help the Operation user to check the state/stats of etcdctl resources in the K8s Cluster Change-Id: I2bf14cf434db9b547ba74307e21f9a4d506e911e --- .../schemas/pegleg/SoftwareVersions/v1.yaml | 18 +++ .../charts/utilities/chart-group.yaml | 1 + .../charts/utilities/etcdctl-utility.yaml | 111 ++++++++++++++++++ global/software/config/versions.yaml | 13 ++ 4 files changed, 143 insertions(+) create mode 100644 global/software/charts/utilities/etcdctl-utility.yaml diff --git a/global/schemas/pegleg/SoftwareVersions/v1.yaml b/global/schemas/pegleg/SoftwareVersions/v1.yaml index 6b4e88dae..96d705b9c 100644 --- a/global/schemas/pegleg/SoftwareVersions/v1.yaml +++ b/global/schemas/pegleg/SoftwareVersions/v1.yaml @@ -806,6 +806,17 @@ data: type: string reference: type: string + etcdctl-utility: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string files: type: object properties: @@ -1021,6 +1032,13 @@ data: type: string image_repo_sync: type: string + etcdctl-utility: + type: object + properties: + etcdctl_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 bd81882b3..2f2cbbc50 100644 --- a/global/software/charts/utilities/chart-group.yaml +++ b/global/software/charts/utilities/chart-group.yaml @@ -14,3 +14,4 @@ data: - calicoctl-utility # - ceph-utility-config # - ceph-utility + - etcdctl-utility diff --git a/global/software/charts/utilities/etcdctl-utility.yaml b/global/software/charts/utilities/etcdctl-utility.yaml new file mode 100644 index 000000000..4d6bd3b02 --- /dev/null +++ b/global/software/charts/utilities/etcdctl-utility.yaml @@ -0,0 +1,111 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: etcdctl-utility + layeringDefinition: + abstract: false + layer: global + labels: + name: etcdctl-utility-global + component: utility + storagePolicy: cleartext + substitutions: + # Chart source + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .charts.utility.etcdctl-utility + dest: + path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.utility.etcdctl-utility + dest: + path: .values.images.tags + # CAs + - src: + schema: deckhand/CertificateAuthority/v1 + name: kubernetes-etcd + path: . + dest: + path: .values.endpoints.etcd.auth.client.tls.ca + - src: + schema: deckhand/Certificate/v1 + name: kubernetes-etcd-anchor + path: . + dest: + path: .values.endpoints.etcd.auth.client.tls.crt + - src: + schema: deckhand/CertificateKey/v1 + name: kubernetes-etcd-anchor + path: . + dest: + path: .values.endpoints.etcd.auth.client.tls.key + # IP addresses + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .kubernetes.etcd_service_ip + dest: + path: .values.endpoints.etcd.host_fqdn_override.default +data: + chart_name: etcdctl-utility + release: etcdctl-utility + namespace: utility + protected: + continue_processing: true + wait: + timeout: 600 + labels: + release_group: airship-etcdctl-utility + install: + no_hooks: false + upgrade: + no_hooks: false + values: + labels: + utility: + node_selector_key: utility + node_selector_value: enabled + endpoints: + etcd: + hosts: + default: kubernetes-etcd + scheme: + default: https + manifests: + configmap_bin: true + configmap_etc_client: true + configmap_etc_sudoers: true + deployment_etcdctl_utility: true + job_image_repo_sync: false + secret_certificates: true + dependencies: + - etcdctl-utility-htk +... +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: etcdctl-utility-htk + layeringDefinition: + abstract: false + layer: global + storagePolicy: cleartext + substitutions: + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .charts.utility.etcdctl-utility-htk + dest: + path: .source +data: + chart_name: etcdctl-utility-htk + release: etcdctl-utility-htk + namespace: etcdctl-utility-htk + values: {} + dependencies: [] +... diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index 75268a0c2..a74b1fc6e 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -562,6 +562,16 @@ data: reference: ef58054dff356334cdbfd96f04dc7c149768c76d subpath: helm-toolkit type: git + etcdctl-utility: + location: https://opendev.org/airship/porthole + reference: cb5d6cfba3541b48cdc1a494cd04cc8ac3fd86c8 + subpath: charts/etcdctl-utility + type: git + etcdctl-utility-htk: + location: https://opendev.org/openstack/openstack-helm-infra + reference: ef58054dff356334cdbfd96f04dc7c149768c76d + subpath: helm-toolkit + type: git images: calico: calico: @@ -1051,6 +1061,9 @@ data: ceph-utility: ceph_utility: quay.io/airshipit/porthole-ceph-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial image_repo_sync: docker.io/docker:18.09.02 + etcdctl-utility: + etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial + image_repo_sync: docker.io/docker:18.09.02 packages: gpgkey: |- -----BEGIN PGP PUBLIC KEY BLOCK-----