openstack/openstack-helm
Code Issues Proposed changes

Merge "Do not attach PVC to glance-storage-init job"

Browse Source
This commit is contained in:
Zuul 2024-06-24 14:52:08 +00:00 committed by Gerrit Code Review
commit 030e60c0a9
11 changed files with 82 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Glance
name: glance
version: 0.4.23
version: 0.4.24
home: https://docs.openstack.org/glance/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
sources:

9
glance/templates/job-storage-init.yaml
View File

@ -164,10 +164,6 @@ spec:
readOnly: true
{{ end }}
{{ end }}
{{- if eq .Values.storage "pvc" }}
- name: glance-images
mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
{{ end }}
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
volumes:
- name: pod-tmp
@ -189,10 +185,5 @@ spec:
secretName: {{ .Values.ceph_client.user_secret_name }}
{{ end }}
{{ end }}
{{- if eq .Values.storage "pvc" }}
- name: glance-images
persistentVolumeClaim:
claimName: glance-images
{{ end }}
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{- end }}

1
releasenotes/notes/glance.yaml
View File

@ -57,4 +57,5 @@ glance:
- 0.4.21 Use uWSGI
- 0.4.22 Enable custom annotations for Openstack secrets
- 0.4.23 Update images used by default
- 0.4.24 Do not attach backend pvc to storage init pod
...

3
tools/deployment/component/common/mariadb.sh
View File

@ -22,9 +22,8 @@ set -xe
#NOTE: Deploy command
helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
--namespace=openstack \
--set volume.use_local_path_for_single_pod_cluster.enabled=true \
--set volume.enabled=false \
--set pod.replicas.server=1 \
${VOLUME_HELM_ARGS:="--set volume.use_local_path_for_single_pod_cluster.enabled=true --set volume.enabled=false"} \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_MARIADB}

2
tools/deployment/component/common/openstack.sh
View File

@ -30,7 +30,7 @@ tee /tmp/glance.yaml <<EOF
glance:
storage: ${GLANCE_BACKEND}
volume:
class_name: standard
class_name: general
EOF
#NOTE: Deploy neutron
tee /tmp/neutron.yaml << EOF

2
tools/deployment/component/common/rabbitmq.sh
View File

@ -22,9 +22,9 @@ set -xe
#NOTE: Deploy command
helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
--namespace=openstack \
--set volume.enabled=false \
--set pod.replicas.server=1 \
--timeout=600s \
${VOLUME_HELM_ARGS:="--set volume.enabled=false"} \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_RABBITMQ}

2
tools/deployment/component/glance/glance.sh
View File

@ -25,7 +25,7 @@ set -xe
tee /tmp/glance.yaml <<EOF
storage: ${GLANCE_BACKEND}
volume:
class_name: standard
class_name: general
bootstrap:
structured:
images:

10
zuul.d/2024.1.yaml
View File

@ -53,6 +53,16 @@
container_distro_name: ubuntu
container_distro_version: jammy
- job:
name: openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy
parent: openstack-helm-compute-kit-rook
nodeset: openstack-helm-5nodes-ubuntu_jammy
vars:
osh_params:
openstack_release: "2024.1"
container_distro_name: ubuntu
container_distro_version: jammy
- job:
name: openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy
parent: openstack-helm-compute-kit

25
zuul.d/base.yaml
View File

@ -95,6 +95,31 @@
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-compute-kit-rook
parent: openstack-helm-deploy
abstract: true
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/ceph/ceph-rook.sh
- ./tools/deployment/component/ceph/ceph-adapter-rook.sh
- ./tools/deployment/common/ingress.sh
- export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/rabbitmq.sh
- export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/mariadb.sh
- ./tools/deployment/component/common/memcached.sh
- ./tools/deployment/component/keystone/keystone.sh
- ./tools/deployment/component/cinder/cinder.sh
- ./tools/deployment/component/heat/heat.sh
- ./tools/deployment/component/glance/glance.sh
- ./tools/deployment/component/compute-kit/openvswitch.sh
- ./tools/deployment/component/compute-kit/libvirt.sh
- ./tools/deployment/component/compute-kit/compute-kit.sh
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-compute-kit-helm-repo-local
parent: openstack-helm-deploy

40
zuul.d/nodesets.yaml
View File

@ -164,3 +164,43 @@
- name: k8s_control_plane
nodes:
- primary
- nodeset:
name: openstack-helm-5nodes-ubuntu_jammy
nodes:
- name: primary
label: ubuntu-jammy
- name: node-1
label: ubuntu-jammy
- name: node-2
label: ubuntu-jammy
- name: node-3
label: ubuntu-jammy
- name: node-4
label: ubuntu-jammy
groups:
- name: primary
nodes:
- primary
- name: nodes
nodes:
- node-1
- node-2
- node-3
- node-4
- name: k8s_cluster
nodes:
- primary
- node-1
- node-2
- node-3
- node-4
- name: k8s_control_plane
nodes:
- primary
- name: k8s_nodes
nodes:
- node-1
- node-2
- node-3
- node-4

1
zuul.d/project.yaml
View File

@ -66,3 +66,4 @@
periodic:
jobs:
- openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy # 1 node + 2 nodes
- openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy # 5 nodes / rook