chore: remove the OSH submodules (#862)

cloudnull · web-flow · commit 0b49b04bd619 · 2025-03-03T09:58:54.000-06:00
Signed-off-by: Kevin Carter &lt;kevin.carter@rackspace.com&gt;
diff --git a/.github/workflows/helm-barbican.yaml b/.github/workflows/helm-barbican.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make barbican
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template barbican ./barbican \
+          ${{ steps.helm.outputs.helm-path }} template barbican openstack-helm/barbican \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-cinder.yaml b/.github/workflows/helm-cinder.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make cinder
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template cinder ./cinder \
+          ${{ steps.helm.outputs.helm-path }} template cinder openstack-helm/cinder \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-glance.yaml b/.github/workflows/helm-glance.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make glance
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template glance ./glance \
+          ${{ steps.helm.outputs.helm-path }} template glance openstack-helm/glance \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-heat.yaml b/.github/workflows/helm-heat.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make heat
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template heat ./heat \
+          ${{ steps.helm.outputs.helm-path }} template heat openstack-helm/heat \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-horizon.yaml b/.github/workflows/helm-horizon.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make horizon
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template horizon ./horizon \
+          ${{ steps.helm.outputs.helm-path }} template horizon openstack-helm/horizon \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-keystone.yaml b/.github/workflows/helm-keystone.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make keystone
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template keystone ./keystone \
+          ${{ steps.helm.outputs.helm-path }} template keystone openstack-helm/keystone \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-libvirt.yaml b/.github/workflows/helm-libvirt.yaml
@@ -28,18 +28,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm-infra
-            make libvirt
+          helm repo add openstack-helm-infra https://tarballs.opendev.org/openstack/openstack-helm-infra
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm-infra
-          ${{ steps.helm.outputs.helm-path }} template libvirt ./libvirt \
+          ${{ steps.helm.outputs.helm-path }} template libvirt openstack-helm-infra/libvirt \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-magnum.yaml b/.github/workflows/helm-magnum.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make magnum
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template magnum ./magnum \
+          ${{ steps.helm.outputs.helm-path }} template magnum openstack-helm/magnum \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-neutron.yaml b/.github/workflows/helm-neutron.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make neutron
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template neutron ./neutron \
+          ${{ steps.helm.outputs.helm-path }} template neutron openstack-helm/neutron \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-nova.yaml b/.github/workflows/helm-nova.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make nova
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template nova ./nova \
+          ${{ steps.helm.outputs.helm-path }} template nova openstack-helm/nova \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-octavia.yaml b/.github/workflows/helm-octavia.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make octavia
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template octavia ./octavia \
+          ${{ steps.helm.outputs.helm-path }} template octavia openstack-helm/octavia \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.github/workflows/helm-placement.yaml b/.github/workflows/helm-placement.yaml
@@ -30,18 +30,13 @@ jobs:
               curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
               chmod +x ./kubectl
             fi
-      - name: Pull OSH submodules
+      - name: Pull OSH repositories
         run: |
-            git submodule update --init submodules/openstack-helm
-            git submodule update --init submodules/openstack-helm-infra
-      - name: Make OSH submodule
-        run: |
-            cd submodules/openstack-helm
-            make placement
+          helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
+          helm repo update
       - name: Run Helm Template
         run: |
-          cd submodules/openstack-helm
-          ${{ steps.helm.outputs.helm-path }} template placement ./placement \
+          ${{ steps.helm.outputs.helm-path }} template placement openstack-helm/placement \
             --namespace=openstack \
             --wait \
             --timeout 120m \
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,6 @@
 [submodule "submodules/kubespray"]
 	path = submodules/kubespray
 	url = https://github.com/kubernetes-sigs/kubespray
-[submodule "submodules/openstack-helm-infra"]
-	path = submodules/openstack-helm-infra
-	url = https://github.com/openstack/openstack-helm-infra
-[submodule "submodules/openstack-helm"]
-	path = submodules/openstack-helm
-	url = https://github.com/openstack/openstack-helm
 [submodule "submodules/rook"]
 	path = submodules/rook
 	url = https://github.com/rook/rook.git
diff --git a/bin/install-keystone.sh b/bin/install-keystone.sh
@@ -4,8 +4,6 @@ GLOBAL_OVERRIDES_DIR="/etc/genestack/helm-configs/global_overrides"
 SERVICE_CONFIG_DIR="/etc/genestack/helm-configs/keystone"
 BASE_OVERRIDES="/opt/genestack/base-helm-configs/keystone/keystone-helm-overrides.yaml"
 
-pushd /opt/genestack/submodules/openstack-helm || exit 1
-
 HELM_CMD="helm upgrade --install keystone openstack-helm/keystone --version 2024.2.386+13651f45-628a320c \
     --namespace=openstack \
     --timeout 120m"
@@ -40,5 +38,3 @@ helm repo update
 echo "Executing Helm command:"
 echo "${HELM_CMD}"
 eval "${HELM_CMD}"
-
-popd || exit 1
diff --git a/bin/install-octavia.sh b/bin/install-octavia.sh
@@ -4,8 +4,6 @@ GLOBAL_OVERRIDES_DIR="/etc/genestack/helm-configs/global_overrides"
 SERVICE_CONFIG_DIR="/etc/genestack/helm-configs/octavia"
 BASE_OVERRIDES="/opt/genestack/base-helm-configs/octavia/octavia-helm-overrides.yaml"
 
-pushd /opt/genestack/submodules/openstack-helm || exit 1
-
 HELM_CMD="helm upgrade --install octavia openstack-helm/octavia --version 2024.2.30+13651f45-628a320c \
     --namespace=openstack \
     --timeout 120m"
@@ -45,5 +43,3 @@ helm repo update
 echo "Executing Helm command:"
 echo "${HELM_CMD}"
 eval "${HELM_CMD}"
-
-popd || exit 1
diff --git a/bin/install-template.sh b/bin/install-template.sh
diff --git a/docs/multi-region-support.md b/docs/multi-region-support.md
@@ -121,35 +121,7 @@ We're going to simply add another `-f` flag below that one to include our overri
 So, our helm command that we'll run against sjc will now look like:
 
 ``` shell
-cd /opt/genestack/submodules/openstack-helm
-
-helm upgrade --install nova ./nova \
-  --namespace=openstack \
-    --timeout 120m \
-    -f /etc/genestack/helm-configs/nova/nova-helm-overrides.yaml \
-    -f /etc/genestack/helm-configs/nova/region1-nova-helm-overrides.yaml \
-    --set conf.nova.neutron.metadata_proxy_shared_secret="$(kubectl --namespace openstack get secret metadata-shared-secret -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.identity.auth.admin.password="$(kubectl --namespace openstack get secret keystone-admin -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.identity.auth.nova.password="$(kubectl --namespace openstack get secret nova-admin -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.identity.auth.neutron.password="$(kubectl --namespace openstack get secret neutron-admin -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.identity.auth.ironic.password="$(kubectl --namespace openstack get secret ironic-admin -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.identity.auth.placement.password="$(kubectl --namespace openstack get secret placement-admin -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.identity.auth.cinder.password="$(kubectl --namespace openstack get secret cinder-admin -o jsonpath='{.data.password}' | base64 -d)" \
-    --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.nova.password="$(kubectl --namespace openstack get secret nova-db-password -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.oslo_db_api.auth.admin.password="$(kubectl --namespace openstack get secret mariadb -o jsonpath='{.data.root-password}' | base64 -d)" \
-    --set endpoints.oslo_db_api.auth.nova.password="$(kubectl --namespace openstack get secret nova-db-password -o jsonpath='{.data.password}' | base64 -d)" \
-    --set endpoints.oslo_db_cell0.auth.admin.password="$(kubectl --namespace openstack get secret mariadb -o jsonpath='{.data.root-password}' | base64 -d)" \
-    --set endpoints.oslo_db_cell0.auth.nova.password="$(kubectl --namespace openstack get secret nova-db-password -o jsonpath='{.data.password}' | base64 -d)" \
-    --set conf.nova.database.slave_connection="mysql+pymysql://nova:$(kubectl --namespace openstack get secret nova-db-password -o jsonpath='{.data.password}' | base64 -d)@mariadb-cluster-secondary.openstack.svc.cluster.local:3306/nova" \
-    --set conf.nova.api_database.slave_connection="mysql+pymysql://nova:$(kubectl --namespace openstack get secret nova-db-password -o jsonpath='{.data.password}' | base64 -d)@mariadb-cluster-secondary.openstack.svc.cluster.local:3306/nova_api" \
-    --set conf.nova.cell0_database.slave_connection="mysql+pymysql://nova:$(kubectl --namespace openstack get secret nova-db-password -o jsonpath='{.data.password}' | base64 -d)@mariadb-cluster-secondary.openstack.svc.cluster.local:3306/nova_cell0" \
-    --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.nova.password="$(kubectl --namespace openstack get secret nova-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
-    --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/overlay
+/opt/genestack/bin/install-nova.sh -f /etc/genestack/helm-configs/nova/region1-nova-helm-overrides.yaml
 ```
 
 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!
diff --git a/docs/openstack-helm-make.md b/docs/openstack-helm-make.md
diff --git a/docs/storage-external-block.md b/docs/storage-external-block.md
diff --git a/mkdocs.yml b/mkdocs.yml
diff --git a/submodules/openstack-helm b/submodules/openstack-helm
diff --git a/submodules/openstack-helm-infra b/submodules/openstack-helm-infra
diff --git a/testing/deploy.yaml b/testing/deploy.yaml
