diff --git a/.github/workflows/publish-artifacts.yaml b/.github/workflows/publish-artifacts.yaml index 7f023ac..39b80c4 100644 --- a/.github/workflows/publish-artifacts.yaml +++ b/.github/workflows/publish-artifacts.yaml @@ -85,4 +85,4 @@ jobs: - name: Publish charts run: ./scripts/publish-charts.py env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/charts/openstack-cluster/templates/secret-cloud-config.yaml b/charts/openstack-cluster/templates/secret-cloud-config.yaml index aa17977..2c61c54 100644 --- a/charts/openstack-cluster/templates/secret-cloud-config.yaml +++ b/charts/openstack-cluster/templates/secret-cloud-config.yaml @@ -4,6 +4,10 @@ kind: Secret metadata: name: {{ include "openstack-cluster.componentName" (list . "cloud-config") }} labels: {{ include "openstack-cluster.componentLabels" (list . "cloud-config") | nindent 4 }} + # If the cloud-config is deleted before the cluster has finished deleting, then the cluster + # deletion cannot proceed any further. So prevent Helm from deleting it. + annotations: + "helm.sh/resource-policy": keep stringData: # Just include the data for the cloud we will be using clouds.yaml: |