Skip to content

Commit

Permalink
Updating docs and scripts to use kustomize overlay by default to depl…
Browse files Browse the repository at this point in the history
…oy services
  • Loading branch information
mohammad committed Nov 18, 2024
1 parent 9f923a6 commit da89b8e
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion bin/install-barbican.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_cache.auth.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--set conf.barbican.keystone_authtoken.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args barbican/base "$@"
--post-renderer-args barbican/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-ceilometer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
rabbit://neutron:$(kubectl --namespace openstack get secret neutron-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/neutron,\
rabbit://nova:$(kubectl --namespace openstack get secret nova-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/nova}" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args ceilometer/base "$@"
--post-renderer-args ceilometer/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-cinder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.cinder.password="$(kubectl --namespace openstack get secret cinder-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args cinder/base "$@"
--post-renderer-args cinder/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-glance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.glance.password="$(kubectl --namespace openstack get secret glance-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args glance/base "$@"
--post-renderer-args glance/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-gnocchi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ pushd /opt/genestack/submodules/openstack-helm-infra || exit
--set endpoints.oslo_db_postgresql.auth.admin.password="$(kubectl --namespace openstack get secret postgresql-db-admin -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_db_postgresql.auth.gnocchi.password="$(kubectl --namespace openstack get secret gnocchi-pgsql-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args gnocchi/base "$@"
--post-renderer-args gnocchi/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-heat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.heat.password="$(kubectl --namespace openstack get secret heat-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args heat/base "$@"
--post-renderer-args heat/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-horizon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_db.auth.admin.password="$(kubectl --namespace openstack get secret mariadb -o jsonpath='{.data.root-password}' | base64 -d)" \
--set endpoints.oslo_db.auth.horizon.password="$(kubectl --namespace openstack get secret horizon-db-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args horizon/base "$@"
--post-renderer-args horizon/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-keystone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.keystone.password="$(kubectl --namespace openstack get secret keystone-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args keystone/base "$@"
--post-renderer-args keystone/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-magnum.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set endpoints.oslo_cache.auth.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--set conf.magnum.keystone_authtoken.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args magnum/base "$@"
--post-renderer-args magnum/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-neutron.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set conf.plugins.ml2_conf.ovn.ovn_nb_connection="tcp:$(kubectl --namespace kube-system get service ovn-nb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--set conf.plugins.ml2_conf.ovn.ovn_sb_connection="tcp:$(kubectl --namespace kube-system get service ovn-sb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args neutron/base "$@"
--post-renderer-args neutron/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-nova.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set network.ssh.public_key="$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.public_key}' | base64 -d)"$'\n' \
--set network.ssh.private_key="$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.private_key}' | base64 -d)"$'\n' \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args nova/base "$@"
--post-renderer-args nova/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-octavia.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set conf.octavia.ovn.ovn_nb_connection="tcp:$(kubectl --namespace kube-system get service ovn-nb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--set conf.octavia.ovn.ovn_sb_connection="tcp:$(kubectl --namespace kube-system get service ovn-sb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args octavia/base "$@"
--post-renderer-args octavia/overlay "$@"
popd || exit
2 changes: 1 addition & 1 deletion bin/install-placement.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ pushd /opt/genestack/submodules/openstack-helm || exit
--set conf.placement.keystone_authtoken.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--set conf.placement.placement_database.slave_connection="mysql+pymysql://placement:$(kubectl --namespace openstack get secret placement-db-password -o jsonpath='{.data.password}' | base64 -d)@mariadb-cluster-secondary.openstack.svc.cluster.local:3306/placement" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args placement/base "$@"
--post-renderer-args placement/overlay "$@"
popd || exit
4 changes: 2 additions & 2 deletions bin/install-prometheus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ helm repo update
helm upgrade --install kube-prometheus-stack prometheus-community/kube-prometheus-stack \
--create-namespace --namespace=prometheus --timeout 10m \
"${values_args[@]}" \
--post-renderer "$GENESTACK_DIR/base-kustomize/kustomize.sh" \
--post-renderer-args prometheus/base "$@"
--post-renderer "$GENESTACK_CONFIG_DIR/kustomize/kustomize.sh" \
--post-renderer-args prometheus/overlay "$@"
2 changes: 1 addition & 1 deletion bin/install-skyline.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
kubectl --namespace openstack apply -k /opt/genestack/base-kustomize/skyline/base
kubectl --namespace openstack apply -k /etc/genestack/kustomize/skyline/overlay
2 changes: 1 addition & 1 deletion docs/grafana.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ You must edit this file to include your specific url and azure tenant id
``` shell
kubectl -n grafana create secret tls grafana-tls-public --cert=/etc/genestack/kustomize/grafana/base/cert.pem --key=/etc/genestack/kustomize/grafana/base/key.pem
kubectl kustomize --enable-helm /etc/genestack/kustomize/grafana/base | \
kubectl kustomize --enable-helm /etc/genestack/kustomize/grafana/overlay | \
kubectl -n grafana apply -f -
```
4 changes: 2 additions & 2 deletions docs/infrastructure-gateway-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ There are various implementations of the Gateway API. In this document, we will
--timeout 10m \
-f /etc/genestack/helm-configs/nginx-gateway-fabric/helm-overrides.yaml \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args gateway/base
--post-renderer-args gateway/overlay
```

=== "Experimental"
Expand Down Expand Up @@ -124,7 +124,7 @@ There are various implementations of the Gateway API. In this document, we will
Apply the configuration using the following command:

``` shell
kubectl kustomize --enable-helm /etc/genestack/kustomize/envoyproxy-gateway/base | kubectl apply -f -
kubectl kustomize --enable-helm /etc/genestack/kustomize/envoyproxy-gateway/overlay | kubectl apply -f -
```

### After installation
Expand Down
2 changes: 1 addition & 1 deletion docs/infrastructure-mariadb.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kubectl --namespace mariadb-system get pods -w
Replication in MariaDB involves synchronizing data between a primary database and one or more replicas, enabling continuous data availability even in the event of hardware failures or outages. By using MariaDB replication, OpenStack deployments can achieve improved fault tolerance and load balancing, ensuring that critical cloud services remain operational and performant at all times.

``` shell
kubectl --namespace openstack apply -k /etc/genestack/kustomize/mariadb-cluster/base
kubectl --namespace openstack apply -k /etc/genestack/kustomize/mariadb-cluster/overlay
```

=== "AIO"
Expand Down
2 changes: 1 addition & 1 deletion docs/infrastructure-memcached.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Deploy the Memcached Cluster

``` shell
kubectl kustomize --enable-helm /etc/genestack/kustomize/memcached/base | kubectl apply --namespace openstack -f -
kubectl kustomize --enable-helm /etc/genestack/kustomize/memcached/overlay | kubectl apply --namespace openstack -f -
```

!!! note
Expand Down
2 changes: 1 addition & 1 deletion docs/infrastructure-postgresql.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ kubectl kustomize --enable-helm /etc/genestack/kustomize/postgres-operator | kub
which has a single replica and less default resource utilization.

```shell
kubectl kustomize /etc/genestack/kustomize/postgres-cluster/base | kubectl apply -f -
kubectl kustomize /etc/genestack/kustomize/postgres-cluster/overlay | kubectl apply -f -
```
2 changes: 1 addition & 1 deletion docs/infrastructure-rabbitmq.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kubectl apply -k /etc/genestack/kustomize/rabbitmq-topology-operator
## Deploy the RabbitMQ cluster.

``` shell
kubectl apply -k /etc/genestack/kustomize/rabbitmq-cluster/base
kubectl apply -k /etc/genestack/kustomize/rabbitmq-cluster/overlay
```

!!! note
Expand Down
2 changes: 1 addition & 1 deletion docs/multi-region-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ helm upgrade --install nova ./nova \
--set network.ssh.public_key="$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.public_key}' | base64 -d)"$'\n' \
--set network.ssh.private_key="$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.private_key}' | base64 -d)"$'\n' \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args nova/base
--post-renderer-args nova/overlay
```

Like mentioned above the only difference here is the additional flag to include our custom override and that's it, we can now version custom changes while maintaining upstream parity across many regions and/or staging envorinments!
Expand Down
2 changes: 1 addition & 1 deletion docs/openstack-skyline.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ OpenStack Skyline is the next-generation web-based dashboard designed to provide
Pause for a moment to consider if you will be wanting to access Skyline via the gateway-api controller over a specific FQDN. If so, adjust the gateway api definitions to suit your needs. For more information view [Gateway API](infrastructure-gateway-api.md)...

``` shell
kubectl --namespace openstack apply -k /etc/genestack/kustomize/skyline/base
kubectl --namespace openstack apply -k /etc/genestack/kustomize/skyline/overlay
```

### Custom Listeners
Expand Down

0 comments on commit da89b8e

Please sign in to comment.