From c4197634288ecfbb99a227dd88c0bb741a405224 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 2 Jan 2024 13:50:32 -0600 Subject: [PATCH] Add support for all services to run in aio mode This allows all of the openstack components to run with either a base or an AIO setup. Signed-off-by: Kevin Carter --- .../aio-example-openstack-overrides.yaml | 3 ++ kustomize/cinder/aio/kustomization.yaml | 18 +++++++++ .../{ => base}/cinder-mariadb-database.yaml | 0 .../{ => base}/cinder-rabbitmq-queue.yaml | 0 .../cinder/{ => base}/hpa-cinder-api.yaml | 0 .../{ => base}/hpa-cinder-scheduler.yaml | 0 .../cinder/{ => base}/kustomization.yaml | 0 kustomize/cinder/kustomize.sh | 6 --- kustomize/glance/aio/kustomization.yaml | 11 ++++++ .../{ => base}/glance-mariadb-database.yaml | 0 .../{ => base}/glance-rabbitmq-queue.yaml | 0 .../glance/{ => base}/hpa-glance-api.yaml | 0 .../glance/{ => base}/kustomization.yaml | 0 kustomize/glance/kustomize.sh | 6 --- kustomize/heat/aio/kustomization.yaml | 25 ++++++++++++ .../{ => base}/heat-mariadb-database.yaml | 0 .../heat/{ => base}/heat-rabbitmq-queue.yaml | 0 kustomize/heat/{ => base}/hpa-heat-api.yaml | 0 kustomize/heat/{ => base}/hpa-heat-cfn.yaml | 0 .../heat/{ => base}/hpa-heat-engine.yaml | 0 kustomize/heat/{ => base}/kustomization.yaml | 0 kustomize/heat/kustomize.sh | 6 --- kustomize/horizon/aio/kustomization.yaml | 11 ++++++ .../{ => base}/horizon-mariadb-database.yaml | 0 .../horizon/{ => base}/hpa-horizon-api.yaml | 0 .../horizon/{ => base}/kustomization.yaml | 0 kustomize/horizon/kustomize.sh | 6 --- kustomize/keystone/aio/kustomization.yaml | 11 ++++++ .../keystone/{ => base}/hpa-keystone-api.yaml | 0 .../{ => base}/keystone-mariadb-database.yaml | 0 .../{ => base}/keystone-rabbitmq-queue.yaml | 0 .../keystone/{ => base}/kustomization.yaml | 0 kustomize/keystone/kustomize.sh | 6 --- kustomize/kustomize.sh | 6 +++ kustomize/neutron/aio/kustomization.yaml | 11 ++++++ .../{ => base}/hpa-neutron-server.yaml | 0 .../neutron/{ => base}/kustomization.yaml | 0 .../{ => base}/neutron-mariadb-database.yaml | 0 .../{ => base}/neutron-rabbitmq-queue.yaml | 0 kustomize/neutron/kustomize.sh | 6 --- kustomize/nova/aio/kustomization.yaml | 39 +++++++++++++++++++ .../{ => base}/hpa-nova-api-metadata.yaml | 0 .../nova/{ => base}/hpa-nova-api-osapi.yaml | 0 .../nova/{ => base}/hpa-nova-conductor.yaml | 0 .../nova/{ => base}/hpa-nova-novncproxy.yaml | 0 .../nova/{ => base}/hpa-nova-scheduler.yaml | 0 kustomize/nova/{ => base}/kustomization.yaml | 0 .../{ => base}/nova-mariadb-database.yaml | 0 .../nova/{ => base}/nova-rabbitmq-queue.yaml | 0 kustomize/nova/kustomize.sh | 6 --- kustomize/octavia/aio/kustomization.yaml | 18 +++++++++ .../octavia/{ => base}/hpa-octavia-api.yaml | 0 .../{ => base}/hpa-octavia-worker.yaml | 0 .../octavia/{ => base}/kustomization.yaml | 0 .../octavia/{ => base}/octavia-agent.yaml | 0 .../{ => base}/octavia-mariadb-database.yaml | 0 .../{ => base}/octavia-rabbitmq-queue.yaml | 0 kustomize/octavia/kustomize.sh | 6 --- kustomize/placement/aio/kustomization.yaml | 11 ++++++ .../{ => base}/hpa-placement-api.yaml | 0 .../placement/{ => base}/kustomization.yaml | 0 .../placement-mariadb-database.yaml | 0 kustomize/placement/kustomize.sh | 6 --- kustomize/skyline/aio/kustomization.yaml | 11 ++++++ .../skyline/{ => base}/configmap-bin.yaml | 0 .../{ => base}/deployment-apiserver.yaml | 0 .../{ => base}/hpa-skyline-apiserver.yaml | 0 .../skyline/{ => base}/ingress-apiserver.yaml | 0 .../skyline/{ => base}/kustomization.yaml | 0 .../skyline/{ => base}/pdb-apiserver.yaml | 0 kustomize/skyline/{ => base}/services.yaml | 0 .../{ => base}/skyline-mariadb-database.yaml | 0 72 files changed, 175 insertions(+), 54 deletions(-) create mode 100644 kustomize/cinder/aio/kustomization.yaml rename kustomize/cinder/{ => base}/cinder-mariadb-database.yaml (100%) rename kustomize/cinder/{ => base}/cinder-rabbitmq-queue.yaml (100%) rename kustomize/cinder/{ => base}/hpa-cinder-api.yaml (100%) rename kustomize/cinder/{ => base}/hpa-cinder-scheduler.yaml (100%) rename kustomize/cinder/{ => base}/kustomization.yaml (100%) delete mode 100755 kustomize/cinder/kustomize.sh create mode 100644 kustomize/glance/aio/kustomization.yaml rename kustomize/glance/{ => base}/glance-mariadb-database.yaml (100%) rename kustomize/glance/{ => base}/glance-rabbitmq-queue.yaml (100%) rename kustomize/glance/{ => base}/hpa-glance-api.yaml (100%) rename kustomize/glance/{ => base}/kustomization.yaml (100%) delete mode 100755 kustomize/glance/kustomize.sh create mode 100644 kustomize/heat/aio/kustomization.yaml rename kustomize/heat/{ => base}/heat-mariadb-database.yaml (100%) rename kustomize/heat/{ => base}/heat-rabbitmq-queue.yaml (100%) rename kustomize/heat/{ => base}/hpa-heat-api.yaml (100%) rename kustomize/heat/{ => base}/hpa-heat-cfn.yaml (100%) rename kustomize/heat/{ => base}/hpa-heat-engine.yaml (100%) rename kustomize/heat/{ => base}/kustomization.yaml (100%) delete mode 100755 kustomize/heat/kustomize.sh create mode 100644 kustomize/horizon/aio/kustomization.yaml rename kustomize/horizon/{ => base}/horizon-mariadb-database.yaml (100%) rename kustomize/horizon/{ => base}/hpa-horizon-api.yaml (100%) rename kustomize/horizon/{ => base}/kustomization.yaml (100%) delete mode 100755 kustomize/horizon/kustomize.sh create mode 100644 kustomize/keystone/aio/kustomization.yaml rename kustomize/keystone/{ => base}/hpa-keystone-api.yaml (100%) rename kustomize/keystone/{ => base}/keystone-mariadb-database.yaml (100%) rename kustomize/keystone/{ => base}/keystone-rabbitmq-queue.yaml (100%) rename kustomize/keystone/{ => base}/kustomization.yaml (100%) delete mode 100755 kustomize/keystone/kustomize.sh create mode 100755 kustomize/kustomize.sh create mode 100644 kustomize/neutron/aio/kustomization.yaml rename kustomize/neutron/{ => base}/hpa-neutron-server.yaml (100%) rename kustomize/neutron/{ => base}/kustomization.yaml (100%) rename kustomize/neutron/{ => base}/neutron-mariadb-database.yaml (100%) rename kustomize/neutron/{ => base}/neutron-rabbitmq-queue.yaml (100%) delete mode 100755 kustomize/neutron/kustomize.sh create mode 100644 kustomize/nova/aio/kustomization.yaml rename kustomize/nova/{ => base}/hpa-nova-api-metadata.yaml (100%) rename kustomize/nova/{ => base}/hpa-nova-api-osapi.yaml (100%) rename kustomize/nova/{ => base}/hpa-nova-conductor.yaml (100%) rename kustomize/nova/{ => base}/hpa-nova-novncproxy.yaml (100%) rename kustomize/nova/{ => base}/hpa-nova-scheduler.yaml (100%) rename kustomize/nova/{ => base}/kustomization.yaml (100%) rename kustomize/nova/{ => base}/nova-mariadb-database.yaml (100%) rename kustomize/nova/{ => base}/nova-rabbitmq-queue.yaml (100%) delete mode 100755 kustomize/nova/kustomize.sh create mode 100644 kustomize/octavia/aio/kustomization.yaml rename kustomize/octavia/{ => base}/hpa-octavia-api.yaml (100%) rename kustomize/octavia/{ => base}/hpa-octavia-worker.yaml (100%) rename kustomize/octavia/{ => base}/kustomization.yaml (100%) rename kustomize/octavia/{ => base}/octavia-agent.yaml (100%) rename kustomize/octavia/{ => base}/octavia-mariadb-database.yaml (100%) rename kustomize/octavia/{ => base}/octavia-rabbitmq-queue.yaml (100%) delete mode 100755 kustomize/octavia/kustomize.sh create mode 100644 kustomize/placement/aio/kustomization.yaml rename kustomize/placement/{ => base}/hpa-placement-api.yaml (100%) rename kustomize/placement/{ => base}/kustomization.yaml (100%) rename kustomize/placement/{ => base}/placement-mariadb-database.yaml (100%) delete mode 100755 kustomize/placement/kustomize.sh create mode 100644 kustomize/skyline/aio/kustomization.yaml rename kustomize/skyline/{ => base}/configmap-bin.yaml (100%) rename kustomize/skyline/{ => base}/deployment-apiserver.yaml (100%) rename kustomize/skyline/{ => base}/hpa-skyline-apiserver.yaml (100%) rename kustomize/skyline/{ => base}/ingress-apiserver.yaml (100%) rename kustomize/skyline/{ => base}/kustomization.yaml (100%) rename kustomize/skyline/{ => base}/pdb-apiserver.yaml (100%) rename kustomize/skyline/{ => base}/services.yaml (100%) rename kustomize/skyline/{ => base}/skyline-mariadb-database.yaml (100%) diff --git a/helm-configs/aio-example-openstack-overrides.yaml b/helm-configs/aio-example-openstack-overrides.yaml index de926dc26..e5bb13750 100644 --- a/helm-configs/aio-example-openstack-overrides.yaml +++ b/helm-configs/aio-example-openstack-overrides.yaml @@ -227,6 +227,9 @@ endpoints: public: 80 scheme: public: http + oslo_messaging: + statefulset: + replicas: 1 placement: host_fqdn_override: public: diff --git a/kustomize/cinder/aio/kustomization.yaml b/kustomize/cinder/aio/kustomization.yaml new file mode 100644 index 000000000..14c5d7b27 --- /dev/null +++ b/kustomize/cinder/aio/kustomization.yaml @@ -0,0 +1,18 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: cinder-api + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: cinder-scheduler + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/cinder/cinder-mariadb-database.yaml b/kustomize/cinder/base/cinder-mariadb-database.yaml similarity index 100% rename from kustomize/cinder/cinder-mariadb-database.yaml rename to kustomize/cinder/base/cinder-mariadb-database.yaml diff --git a/kustomize/cinder/cinder-rabbitmq-queue.yaml b/kustomize/cinder/base/cinder-rabbitmq-queue.yaml similarity index 100% rename from kustomize/cinder/cinder-rabbitmq-queue.yaml rename to kustomize/cinder/base/cinder-rabbitmq-queue.yaml diff --git a/kustomize/cinder/hpa-cinder-api.yaml b/kustomize/cinder/base/hpa-cinder-api.yaml similarity index 100% rename from kustomize/cinder/hpa-cinder-api.yaml rename to kustomize/cinder/base/hpa-cinder-api.yaml diff --git a/kustomize/cinder/hpa-cinder-scheduler.yaml b/kustomize/cinder/base/hpa-cinder-scheduler.yaml similarity index 100% rename from kustomize/cinder/hpa-cinder-scheduler.yaml rename to kustomize/cinder/base/hpa-cinder-scheduler.yaml diff --git a/kustomize/cinder/kustomization.yaml b/kustomize/cinder/base/kustomization.yaml similarity index 100% rename from kustomize/cinder/kustomization.yaml rename to kustomize/cinder/base/kustomization.yaml diff --git a/kustomize/cinder/kustomize.sh b/kustomize/cinder/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/cinder/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/glance/aio/kustomization.yaml b/kustomize/glance/aio/kustomization.yaml new file mode 100644 index 000000000..493f677bc --- /dev/null +++ b/kustomize/glance/aio/kustomization.yaml @@ -0,0 +1,11 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: glance-api + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/glance/glance-mariadb-database.yaml b/kustomize/glance/base/glance-mariadb-database.yaml similarity index 100% rename from kustomize/glance/glance-mariadb-database.yaml rename to kustomize/glance/base/glance-mariadb-database.yaml diff --git a/kustomize/glance/glance-rabbitmq-queue.yaml b/kustomize/glance/base/glance-rabbitmq-queue.yaml similarity index 100% rename from kustomize/glance/glance-rabbitmq-queue.yaml rename to kustomize/glance/base/glance-rabbitmq-queue.yaml diff --git a/kustomize/glance/hpa-glance-api.yaml b/kustomize/glance/base/hpa-glance-api.yaml similarity index 100% rename from kustomize/glance/hpa-glance-api.yaml rename to kustomize/glance/base/hpa-glance-api.yaml diff --git a/kustomize/glance/kustomization.yaml b/kustomize/glance/base/kustomization.yaml similarity index 100% rename from kustomize/glance/kustomization.yaml rename to kustomize/glance/base/kustomization.yaml diff --git a/kustomize/glance/kustomize.sh b/kustomize/glance/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/glance/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/heat/aio/kustomization.yaml b/kustomize/heat/aio/kustomization.yaml new file mode 100644 index 000000000..f92a5ef66 --- /dev/null +++ b/kustomize/heat/aio/kustomization.yaml @@ -0,0 +1,25 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: heat-api + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: heat-cfn + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: heat-engine + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/heat/heat-mariadb-database.yaml b/kustomize/heat/base/heat-mariadb-database.yaml similarity index 100% rename from kustomize/heat/heat-mariadb-database.yaml rename to kustomize/heat/base/heat-mariadb-database.yaml diff --git a/kustomize/heat/heat-rabbitmq-queue.yaml b/kustomize/heat/base/heat-rabbitmq-queue.yaml similarity index 100% rename from kustomize/heat/heat-rabbitmq-queue.yaml rename to kustomize/heat/base/heat-rabbitmq-queue.yaml diff --git a/kustomize/heat/hpa-heat-api.yaml b/kustomize/heat/base/hpa-heat-api.yaml similarity index 100% rename from kustomize/heat/hpa-heat-api.yaml rename to kustomize/heat/base/hpa-heat-api.yaml diff --git a/kustomize/heat/hpa-heat-cfn.yaml b/kustomize/heat/base/hpa-heat-cfn.yaml similarity index 100% rename from kustomize/heat/hpa-heat-cfn.yaml rename to kustomize/heat/base/hpa-heat-cfn.yaml diff --git a/kustomize/heat/hpa-heat-engine.yaml b/kustomize/heat/base/hpa-heat-engine.yaml similarity index 100% rename from kustomize/heat/hpa-heat-engine.yaml rename to kustomize/heat/base/hpa-heat-engine.yaml diff --git a/kustomize/heat/kustomization.yaml b/kustomize/heat/base/kustomization.yaml similarity index 100% rename from kustomize/heat/kustomization.yaml rename to kustomize/heat/base/kustomization.yaml diff --git a/kustomize/heat/kustomize.sh b/kustomize/heat/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/heat/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/horizon/aio/kustomization.yaml b/kustomize/horizon/aio/kustomization.yaml new file mode 100644 index 000000000..d0a446b32 --- /dev/null +++ b/kustomize/horizon/aio/kustomization.yaml @@ -0,0 +1,11 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: horizon + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/horizon/horizon-mariadb-database.yaml b/kustomize/horizon/base/horizon-mariadb-database.yaml similarity index 100% rename from kustomize/horizon/horizon-mariadb-database.yaml rename to kustomize/horizon/base/horizon-mariadb-database.yaml diff --git a/kustomize/horizon/hpa-horizon-api.yaml b/kustomize/horizon/base/hpa-horizon-api.yaml similarity index 100% rename from kustomize/horizon/hpa-horizon-api.yaml rename to kustomize/horizon/base/hpa-horizon-api.yaml diff --git a/kustomize/horizon/kustomization.yaml b/kustomize/horizon/base/kustomization.yaml similarity index 100% rename from kustomize/horizon/kustomization.yaml rename to kustomize/horizon/base/kustomization.yaml diff --git a/kustomize/horizon/kustomize.sh b/kustomize/horizon/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/horizon/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/keystone/aio/kustomization.yaml b/kustomize/keystone/aio/kustomization.yaml new file mode 100644 index 000000000..508adb110 --- /dev/null +++ b/kustomize/keystone/aio/kustomization.yaml @@ -0,0 +1,11 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: keystone-api + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/keystone/hpa-keystone-api.yaml b/kustomize/keystone/base/hpa-keystone-api.yaml similarity index 100% rename from kustomize/keystone/hpa-keystone-api.yaml rename to kustomize/keystone/base/hpa-keystone-api.yaml diff --git a/kustomize/keystone/keystone-mariadb-database.yaml b/kustomize/keystone/base/keystone-mariadb-database.yaml similarity index 100% rename from kustomize/keystone/keystone-mariadb-database.yaml rename to kustomize/keystone/base/keystone-mariadb-database.yaml diff --git a/kustomize/keystone/keystone-rabbitmq-queue.yaml b/kustomize/keystone/base/keystone-rabbitmq-queue.yaml similarity index 100% rename from kustomize/keystone/keystone-rabbitmq-queue.yaml rename to kustomize/keystone/base/keystone-rabbitmq-queue.yaml diff --git a/kustomize/keystone/kustomization.yaml b/kustomize/keystone/base/kustomization.yaml similarity index 100% rename from kustomize/keystone/kustomization.yaml rename to kustomize/keystone/base/kustomization.yaml diff --git a/kustomize/keystone/kustomize.sh b/kustomize/keystone/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/keystone/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/kustomize.sh b/kustomize/kustomize.sh new file mode 100755 index 000000000..edd0a1b43 --- /dev/null +++ b/kustomize/kustomize.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e +pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null + cat <&0 > ${1}/../base/all.yaml + kubectl kustomize --reorder='none' ${1} +popd &>/dev/nulls diff --git a/kustomize/neutron/aio/kustomization.yaml b/kustomize/neutron/aio/kustomization.yaml new file mode 100644 index 000000000..8a3d41e86 --- /dev/null +++ b/kustomize/neutron/aio/kustomization.yaml @@ -0,0 +1,11 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: neutron-server + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/neutron/hpa-neutron-server.yaml b/kustomize/neutron/base/hpa-neutron-server.yaml similarity index 100% rename from kustomize/neutron/hpa-neutron-server.yaml rename to kustomize/neutron/base/hpa-neutron-server.yaml diff --git a/kustomize/neutron/kustomization.yaml b/kustomize/neutron/base/kustomization.yaml similarity index 100% rename from kustomize/neutron/kustomization.yaml rename to kustomize/neutron/base/kustomization.yaml diff --git a/kustomize/neutron/neutron-mariadb-database.yaml b/kustomize/neutron/base/neutron-mariadb-database.yaml similarity index 100% rename from kustomize/neutron/neutron-mariadb-database.yaml rename to kustomize/neutron/base/neutron-mariadb-database.yaml diff --git a/kustomize/neutron/neutron-rabbitmq-queue.yaml b/kustomize/neutron/base/neutron-rabbitmq-queue.yaml similarity index 100% rename from kustomize/neutron/neutron-rabbitmq-queue.yaml rename to kustomize/neutron/base/neutron-rabbitmq-queue.yaml diff --git a/kustomize/neutron/kustomize.sh b/kustomize/neutron/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/neutron/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/nova/aio/kustomization.yaml b/kustomize/nova/aio/kustomization.yaml new file mode 100644 index 000000000..b85ed5860 --- /dev/null +++ b/kustomize/nova/aio/kustomization.yaml @@ -0,0 +1,39 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: nova-api-metadata + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: nova-api-osapi + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: nova-conductor + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: nova-novncproxy + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: nova-scheduler + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/nova/hpa-nova-api-metadata.yaml b/kustomize/nova/base/hpa-nova-api-metadata.yaml similarity index 100% rename from kustomize/nova/hpa-nova-api-metadata.yaml rename to kustomize/nova/base/hpa-nova-api-metadata.yaml diff --git a/kustomize/nova/hpa-nova-api-osapi.yaml b/kustomize/nova/base/hpa-nova-api-osapi.yaml similarity index 100% rename from kustomize/nova/hpa-nova-api-osapi.yaml rename to kustomize/nova/base/hpa-nova-api-osapi.yaml diff --git a/kustomize/nova/hpa-nova-conductor.yaml b/kustomize/nova/base/hpa-nova-conductor.yaml similarity index 100% rename from kustomize/nova/hpa-nova-conductor.yaml rename to kustomize/nova/base/hpa-nova-conductor.yaml diff --git a/kustomize/nova/hpa-nova-novncproxy.yaml b/kustomize/nova/base/hpa-nova-novncproxy.yaml similarity index 100% rename from kustomize/nova/hpa-nova-novncproxy.yaml rename to kustomize/nova/base/hpa-nova-novncproxy.yaml diff --git a/kustomize/nova/hpa-nova-scheduler.yaml b/kustomize/nova/base/hpa-nova-scheduler.yaml similarity index 100% rename from kustomize/nova/hpa-nova-scheduler.yaml rename to kustomize/nova/base/hpa-nova-scheduler.yaml diff --git a/kustomize/nova/kustomization.yaml b/kustomize/nova/base/kustomization.yaml similarity index 100% rename from kustomize/nova/kustomization.yaml rename to kustomize/nova/base/kustomization.yaml diff --git a/kustomize/nova/nova-mariadb-database.yaml b/kustomize/nova/base/nova-mariadb-database.yaml similarity index 100% rename from kustomize/nova/nova-mariadb-database.yaml rename to kustomize/nova/base/nova-mariadb-database.yaml diff --git a/kustomize/nova/nova-rabbitmq-queue.yaml b/kustomize/nova/base/nova-rabbitmq-queue.yaml similarity index 100% rename from kustomize/nova/nova-rabbitmq-queue.yaml rename to kustomize/nova/base/nova-rabbitmq-queue.yaml diff --git a/kustomize/nova/kustomize.sh b/kustomize/nova/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/nova/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/octavia/aio/kustomization.yaml b/kustomize/octavia/aio/kustomization.yaml new file mode 100644 index 000000000..78ede6ab5 --- /dev/null +++ b/kustomize/octavia/aio/kustomization.yaml @@ -0,0 +1,18 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: octavia-api + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 + - target: + kind: HorizontalPodAutoscaler + name: octavia-worker + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/octavia/hpa-octavia-api.yaml b/kustomize/octavia/base/hpa-octavia-api.yaml similarity index 100% rename from kustomize/octavia/hpa-octavia-api.yaml rename to kustomize/octavia/base/hpa-octavia-api.yaml diff --git a/kustomize/octavia/hpa-octavia-worker.yaml b/kustomize/octavia/base/hpa-octavia-worker.yaml similarity index 100% rename from kustomize/octavia/hpa-octavia-worker.yaml rename to kustomize/octavia/base/hpa-octavia-worker.yaml diff --git a/kustomize/octavia/kustomization.yaml b/kustomize/octavia/base/kustomization.yaml similarity index 100% rename from kustomize/octavia/kustomization.yaml rename to kustomize/octavia/base/kustomization.yaml diff --git a/kustomize/octavia/octavia-agent.yaml b/kustomize/octavia/base/octavia-agent.yaml similarity index 100% rename from kustomize/octavia/octavia-agent.yaml rename to kustomize/octavia/base/octavia-agent.yaml diff --git a/kustomize/octavia/octavia-mariadb-database.yaml b/kustomize/octavia/base/octavia-mariadb-database.yaml similarity index 100% rename from kustomize/octavia/octavia-mariadb-database.yaml rename to kustomize/octavia/base/octavia-mariadb-database.yaml diff --git a/kustomize/octavia/octavia-rabbitmq-queue.yaml b/kustomize/octavia/base/octavia-rabbitmq-queue.yaml similarity index 100% rename from kustomize/octavia/octavia-rabbitmq-queue.yaml rename to kustomize/octavia/base/octavia-rabbitmq-queue.yaml diff --git a/kustomize/octavia/kustomize.sh b/kustomize/octavia/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/octavia/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/placement/aio/kustomization.yaml b/kustomize/placement/aio/kustomization.yaml new file mode 100644 index 000000000..50a578a60 --- /dev/null +++ b/kustomize/placement/aio/kustomization.yaml @@ -0,0 +1,11 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: placement-api + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/placement/hpa-placement-api.yaml b/kustomize/placement/base/hpa-placement-api.yaml similarity index 100% rename from kustomize/placement/hpa-placement-api.yaml rename to kustomize/placement/base/hpa-placement-api.yaml diff --git a/kustomize/placement/kustomization.yaml b/kustomize/placement/base/kustomization.yaml similarity index 100% rename from kustomize/placement/kustomization.yaml rename to kustomize/placement/base/kustomization.yaml diff --git a/kustomize/placement/placement-mariadb-database.yaml b/kustomize/placement/base/placement-mariadb-database.yaml similarity index 100% rename from kustomize/placement/placement-mariadb-database.yaml rename to kustomize/placement/base/placement-mariadb-database.yaml diff --git a/kustomize/placement/kustomize.sh b/kustomize/placement/kustomize.sh deleted file mode 100755 index 82c974765..000000000 --- a/kustomize/placement/kustomize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e -pushd $(dirname "${BASH_SOURCE[0]}") &>/dev/null - cat <&0 > all.yaml - kubectl kustomize --reorder='none' -popd &>/dev/null diff --git a/kustomize/skyline/aio/kustomization.yaml b/kustomize/skyline/aio/kustomization.yaml new file mode 100644 index 000000000..e52396b13 --- /dev/null +++ b/kustomize/skyline/aio/kustomization.yaml @@ -0,0 +1,11 @@ +bases: + - ../base + +patches: + - target: + kind: HorizontalPodAutoscaler + name: skyline-apiserver + patch: |- + - op: replace + path: /spec/minReplicas + value: 1 diff --git a/kustomize/skyline/configmap-bin.yaml b/kustomize/skyline/base/configmap-bin.yaml similarity index 100% rename from kustomize/skyline/configmap-bin.yaml rename to kustomize/skyline/base/configmap-bin.yaml diff --git a/kustomize/skyline/deployment-apiserver.yaml b/kustomize/skyline/base/deployment-apiserver.yaml similarity index 100% rename from kustomize/skyline/deployment-apiserver.yaml rename to kustomize/skyline/base/deployment-apiserver.yaml diff --git a/kustomize/skyline/hpa-skyline-apiserver.yaml b/kustomize/skyline/base/hpa-skyline-apiserver.yaml similarity index 100% rename from kustomize/skyline/hpa-skyline-apiserver.yaml rename to kustomize/skyline/base/hpa-skyline-apiserver.yaml diff --git a/kustomize/skyline/ingress-apiserver.yaml b/kustomize/skyline/base/ingress-apiserver.yaml similarity index 100% rename from kustomize/skyline/ingress-apiserver.yaml rename to kustomize/skyline/base/ingress-apiserver.yaml diff --git a/kustomize/skyline/kustomization.yaml b/kustomize/skyline/base/kustomization.yaml similarity index 100% rename from kustomize/skyline/kustomization.yaml rename to kustomize/skyline/base/kustomization.yaml diff --git a/kustomize/skyline/pdb-apiserver.yaml b/kustomize/skyline/base/pdb-apiserver.yaml similarity index 100% rename from kustomize/skyline/pdb-apiserver.yaml rename to kustomize/skyline/base/pdb-apiserver.yaml diff --git a/kustomize/skyline/services.yaml b/kustomize/skyline/base/services.yaml similarity index 100% rename from kustomize/skyline/services.yaml rename to kustomize/skyline/base/services.yaml diff --git a/kustomize/skyline/skyline-mariadb-database.yaml b/kustomize/skyline/base/skyline-mariadb-database.yaml similarity index 100% rename from kustomize/skyline/skyline-mariadb-database.yaml rename to kustomize/skyline/base/skyline-mariadb-database.yaml