Merge "Charts: make manifests optional for all OpenStack elements"

This commit is contained in:
Jenkins
2017-08-07 22:28:06 +00:00
committed by Gerrit Code Review
226 changed files with 709 additions and 5 deletions

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -33,3 +34,4 @@ data:
{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
ks-user.sh: |
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
{{- end }}

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }}
{{- include "barbican.conf.barbican_values_skeleton" .Values.conf.barbican | trunc 0 -}}
@@ -107,3 +108,4 @@ data:
{{- end }}
barbican-api.ini: |+
{{ tuple "etc/_barbican-api.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_api }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.api }}
{{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }}
@@ -97,3 +98,4 @@ spec:
name: barbican-bin
defaultMode: 0555
{{- if $mounts_barbican_api.volumes }}{{ toYaml $mounts_barbican_api.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "key-manager" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: b-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_bootstrap }}
{{- $envAll := . }}
{{- if .Values.bootstrap.enabled }}
{{- $dependencies := .Values.dependencies.bootstrap }}
@@ -57,3 +58,4 @@ spec:
defaultMode: 0555
{{- if $mounts_barbican_bootstrap.volumes }}{{ toYaml $mounts_barbican_bootstrap.volumes | indent 6 }}{{ end }}
{{- end }}
{{- end }}

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_init }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_init }}
---
@@ -69,3 +70,4 @@ spec:
configMap:
name: barbican-bin
defaultMode: 0555
{{- end }}

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_sync }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_sync }}
---
@@ -57,3 +58,4 @@ spec:
configMap:
name: barbican-bin
defaultMode: 0555
{{- end }}

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_endpoints }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
---
@@ -61,3 +62,4 @@ spec:
configMap:
name: barbican-bin
defaultMode: 0555
{{- end }}

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_service }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_service }}
---
@@ -55,3 +56,4 @@ spec:
configMap:
name: barbican-bin
defaultMode: 0555
{{- end }}

View File

@@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_user }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_user }}
---
@@ -56,3 +57,4 @@ spec:
configMap:
name: barbican-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_api }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_db }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_keystone }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_api }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -14,6 +14,8 @@ labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
release_group: null
images:
bootstrap: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
@@ -277,3 +279,20 @@ endpoints:
port:
memcache:
default: 11211
manifests:
configmap_bin: true
configmap_etc: true
deployment_api: true
ingress_api: true
job_bootstrap: true
job_db_init: true
job_db_sync: true
job_ks_endpoints: true
job_ks_service: true
job_ks_user: true
pdb_api: true
secret_db: true
secret_keystone: true
service_ingress_api: true
service_api: true

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -45,3 +46,4 @@ data:
bootstrap.sh: |+
{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }}
{{- include "cinder.conf.cinder_values_skeleton" .Values.conf.cinder | trunc 0 -}}
@@ -122,3 +123,4 @@ data:
{{- else -}}
{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_api }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.api }}
{{- $mounts_cinder_api := .Values.pod.mounts.cinder_api.cinder_api }}
@@ -87,3 +88,4 @@ spec:
name: cinder-etc
defaultMode: 0444
{{- if $mounts_cinder_api.volumes }}{{ toYaml $mounts_cinder_api.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_backup }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.backup }}
{{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }}
@@ -105,3 +106,4 @@ spec:
secretName: pvc-ceph-client-key
{{ end }}
{{- if $mounts_cinder_backup.volumes }}{{ toYaml $mounts_cinder_backup.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_scheduler }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.scheduler }}
{{- $mounts_cinder_scheduler := .Values.pod.mounts.cinder_scheduler.cinder_scheduler }}
@@ -73,3 +74,4 @@ spec:
name: cinder-etc
defaultMode: 0444
{{- if $mounts_cinder_scheduler.volumes }}{{ toYaml $mounts_cinder_scheduler.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_volume }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.volume }}
{{- $mounts_cinder_volume := .Values.pod.mounts.cinder_volume.cinder_volume }}
@@ -108,3 +109,4 @@ spec:
secretName: pvc-ceph-client-key
{{ end }}
{{- if $mounts_cinder_volume.volumes }}{{ toYaml $mounts_cinder_volume.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "volume" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: c-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_bootstrap }}
{{- $envAll := . }}
{{- if .Values.bootstrap.enabled }}
{{- $dependencies := .Values.dependencies.bootstrap }}
@@ -61,3 +62,4 @@ spec:
name: cinder-bin
defaultMode: 0555
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_init }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_init }}
---
@@ -71,3 +72,4 @@ spec:
configMap:
name: cinder-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_sync }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_sync }}
---
@@ -58,3 +59,4 @@ spec:
configMap:
name: cinder-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_endpoints }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
---
@@ -63,3 +64,4 @@ spec:
configMap:
name: cinder-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_service }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_service }}
---
@@ -57,3 +58,4 @@ spec:
configMap:
name: cinder-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_user }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_user }}
---
@@ -58,3 +59,4 @@ spec:
configMap:
name: cinder-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_api }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "cinder" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pod_rally_test }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.tests }}
{{- $mounts_cinder_tests := .Values.pod.mounts.cinder_tests.cinder_tests }}
@@ -64,3 +65,4 @@ spec:
- name: rally-db
emptyDir: {}
{{- if $mounts_cinder_tests.volumes }}{{ toYaml $mounts_cinder_tests.volumes | indent 4 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_db }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_keystone }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_api }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -23,6 +23,8 @@ labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
release_group: null
images:
test: docker.io/kolla/ubuntu-binary-rally:4.0.0
db_init: docker.io/kolla/ubuntu-source-cinder-api:3.0.3
@@ -459,3 +461,24 @@ endpoints:
port:
memcache:
default: 11211
manifests:
configmap_bin: true
configmap_etc: true
deployment_api: true
deployment_backup: true
deployment_scheduler: true
deployment_volume: true
ingress_api: true
job_bootstrap: true
job_db_init: true
job_db_sync: true
job_ks_endpoints: true
job_ks_service: true
job_ks_user: true
pdb_api: true
pod_rally_test: true
secret_db: true
secret_keystone: true
service_api: true
service_ingress_api: true

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -41,3 +42,4 @@ data:
{{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
clean.sh: |+
{{ tuple "bin/_clean.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }}
{{- include "glance.conf.glance_values_skeleton" .Values.conf.glance | trunc 0 -}}
@@ -179,3 +180,4 @@ data:
{{- else -}}
{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_api }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.api }}
{{- $mounts_glance_api := .Values.pod.mounts.glance_api.glance_api }}
@@ -154,3 +155,4 @@ spec:
secretName: pvc-ceph-client-key
{{- end }}
{{- if $mounts_glance_api.volumes }}{{ toYaml $mounts_glance_api.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_registry }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.registry }}
{{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }}
@@ -90,3 +91,4 @@ spec:
name: glance-etc
defaultMode: 0444
{{- if $mounts_glance_registry.volumes }}{{ toYaml $mounts_glance_registry.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -40,3 +41,4 @@ spec:
serviceName: {{ tuple "image" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: g-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_registry }}
{{- $envAll := . }}
{{- if .Values.network.registry.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "image_registry" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: g-reg
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_bootstrap }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.bootstrap }}
---
@@ -63,3 +64,4 @@ spec:
configMap:
name: glance-etc
defaultMode: 0444
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_clean }}
{{- $envAll := . }}
{{- if .Values.bootstrap.enabled }}
---
@@ -50,3 +51,4 @@ spec:
name: glance-bin
defaultMode: 0555
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_init }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_init }}
---
@@ -71,3 +72,4 @@ spec:
configMap:
name: glance-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_sync }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_sync }}
---
@@ -59,3 +60,4 @@ spec:
configMap:
name: glance-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_endpoints }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
---
@@ -63,3 +64,4 @@ spec:
configMap:
name: glance-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_service }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_service }}
---
@@ -57,3 +58,4 @@ spec:
configMap:
name: glance-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_user }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_user }}
---
@@ -58,3 +59,4 @@ spec:
configMap:
name: glance-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_api }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "glance" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_registry }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pod_rally_test }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.tests }}
{{- $mounts_glance_tests := .Values.pod.mounts.glance_tests.glance_tests }}
@@ -64,3 +65,4 @@ spec:
- name: rally-db
emptyDir: {}
{{- if $mounts_glance_tests.volumes }}{{ toYaml $mounts_glance_tests.volumes | indent 4 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pvc_images }}
{{- $envAll := . }}
{{- if eq .Values.storage "pvc" }}
---
@@ -26,3 +27,4 @@ spec:
storage: {{ .Values.volume.size }}
storageClassName: {{ .Values.volume.class_name }}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_db }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_keystone }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_api }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_registry }}
{{- $envAll := . }}
{{- if .Values.network.registry.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_registry }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.registry.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -24,6 +24,8 @@ labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
release_group: null
images:
test: docker.io/kolla/ubuntu-binary-rally:4.0.0
db_init: docker.io/kolla/ubuntu-source-glance-api:3.0.3
@@ -416,3 +418,28 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
manifests:
configmap_bin: true
configmap_etc: true
deployment_api: true
deployment_registry: true
ingress_api: true
ingress_registry: true
job_bootstrap: true
job_clean: true
job_db_init: true
job_db_sync: true
job_ks_endpoints: true
job_ks_service: true
job_ks_user: true
pdb_api: true
pdb_registry: true
pod_rally_test: true
pvc_images: true
secret_db: true
secret_keystone: true
service_ingress_api: true
service_ingress_registry: true
service_api: true
service_registry: true

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -43,3 +44,4 @@ data:
{{ tuple "bin/_heat-cloudwatch.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
heat-engine.sh: |
{{ tuple "bin/_heat-engine.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }}
{{- include "heat.conf.heat_values_skeleton" .Values.conf.heat | trunc 0 -}}
@@ -141,3 +142,4 @@ data:
{{- else -}}
{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_api }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.api }}
{{- $mounts_heat_api := .Values.pod.mounts.heat_api.heat_api }}
@@ -94,3 +95,4 @@ spec:
name: heat-etc
defaultMode: 0444
{{- if $mounts_heat_api.volumes }}{{ toYaml $mounts_heat_api.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_cfn }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.cfn }}
{{- $mounts_heat_cfn := .Values.pod.mounts.heat_cfn.heat_cfn }}
@@ -94,3 +95,4 @@ spec:
name: heat-etc
defaultMode: 0444
{{- if $mounts_heat_cfn.volumes }}{{ toYaml $mounts_heat_cfn.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment_cloudwatch }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.cloudwatch }}
{{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }}
@@ -94,3 +95,4 @@ spec:
name: heat-etc
defaultMode: 0444
{{- if $mounts_heat_cloudwatch.volumes }}{{ toYaml $mounts_heat_cloudwatch.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "orchestration" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: h-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_cfn }}
{{- $envAll := . }}
{{- if .Values.network.cfn.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "cloudformation" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: h-cfn
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_cloudwatch }}
{{- $envAll := . }}
{{- if .Values.network.cloudwatch.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "cloudwatch" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: h-cwh
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_bootstrap }}
{{- $envAll := . }}
{{- if .Values.bootstrap.enabled }}
{{- $dependencies := .Values.dependencies.bootstrap }}
@@ -57,3 +58,4 @@ spec:
defaultMode: 0555
{{- if $mounts_heat_bootstrap.volumes }}{{ toYaml $mounts_heat_bootstrap.volumes | indent 6 }}{{ end }}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_init }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_init }}
---
@@ -71,3 +72,4 @@ spec:
configMap:
name: heat-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_sync }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_sync }}
---
@@ -59,3 +60,4 @@ spec:
configMap:
name: heat-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_endpoints }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
---
@@ -63,3 +64,4 @@ spec:
configMap:
name: heat-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_service }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_service }}
---
@@ -57,3 +58,4 @@ spec:
configMap:
name: heat-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_ks_user }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_user }}
---
@@ -117,3 +118,4 @@ spec:
configMap:
name: heat-bin
defaultMode: 0555
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_api }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "heat" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_cfn }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "heat" "cfn" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb_cloudwatch }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_db }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_keystone }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" "trustee" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
@@ -36,3 +37,4 @@ data:
OS_DOMAIN_NAME: {{ .Values.endpoints.identity.auth.stack_user.domain_name | b64enc | indent 4 }}
OS_USERNAME: {{ .Values.endpoints.identity.auth.stack_user.username | b64enc | indent 4 }}
OS_PASSWORD: {{ .Values.endpoints.identity.auth.stack_user.password | b64enc | indent 4 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_api }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_cfn }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.cfn.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_cloudwatch }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -30,3 +31,4 @@ spec:
{{ if .Values.network.cloudwatch.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.api.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_cfn }}
{{- $envAll := . }}
{{- if .Values.network.cfn.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress_cloudwatch }}
{{- $envAll := . }}
{{- if .Values.network.cloudwatch.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.statefulset_engine }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.engine }}
{{- $mounts_heat_engine := .Values.pod.mounts.heat_engine.heat_engine }}
@@ -74,3 +75,4 @@ spec:
name: heat-etc
defaultMode: 0444
{{- if $mounts_heat_engine.volumes }}{{ toYaml $mounts_heat_engine.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -17,6 +17,8 @@
# Declare name/value pairs to be passed into your templates.
# name: value
release_group: null
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@@ -454,3 +456,31 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
manifests:
configmap_bin: true
configmap_etc: true
deployment_api: true
deployment_cfn: true
deployment_cloudwatch: true
ingress_api: true
ingress_cfn: true
ingress_cloudwatch: true
job_bootstrap: true
job_db_init: true
job_db_sync: true
job_ks_endpoints: true
job_ks_service: true
job_ks_user: true
pdb_api: true
pdb_cfn: true
pdb_cloudwatch: true
secret_db: true
secret_keystone: true
service_api: true
service_cfn: true
service_cloudwatch: true
service_ingress_api: true
service_ingress_cfn: true
service_ingress_cloudwatch: true
statefulset_engine: true

View File

@@ -16,7 +16,7 @@
{{- $envAll := index . 0 -}}
{{- $application := index . 1 -}}
{{- $component := index . 2 -}}
release_name: {{ $envAll.Release.Name }}
release_group: {{ $envAll.Values.release_group | default $envAll.Release.Name }}
application: {{ $application }}
component: {{ $component }}
{{- end -}}

View File

@@ -23,10 +23,10 @@ podAntiAffinity:
- podAffinityTerm:
labelSelector:
matchExpressions:
- key: release_name
- key: release_group
operator: In
values:
- {{ $envAll.Release.Name }}
- {{ $envAll.Values.release_group | default $envAll.Release.Name }}
- key: application
operator: In
values:

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -25,3 +26,4 @@ data:
{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
horizon.sh: |
{{ tuple "bin/_horizon.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -23,3 +24,4 @@ data:
{{ tuple "etc/_horizon.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
local_settings: |
{{ tuple "etc/_local_settings.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.deployment }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.dashboard }}
{{- $mounts_horizon := .Values.pod.mounts.horizon.horizon }}
@@ -84,3 +85,4 @@ spec:
name: horizon-etc
defaultMode: 0444
{{- if $mounts_horizon.volumes }}{{ toYaml $mounts_horizon.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.ingress.public }}
---
@@ -39,3 +40,4 @@ spec:
serviceName: {{ tuple "dashboard" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: http
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_init }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_init }}
{{- $mounts_horizon_db_init := .Values.pod.mounts.horizon_db_init.horizon_db_init }}
@@ -62,3 +63,4 @@ spec:
name: horizon-bin
defaultMode: 0555
{{- if $mounts_horizon_db_init.volumes }}{{ toYaml $mounts_horizon_db_init.volumes | indent 6 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.job_db_sync }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_sync }}
{{- $mounts_horizon_db_sync := .Values.pod.mounts.horizon_db_sync.horizon_db_sync }}
@@ -58,3 +59,4 @@ spec:
name: horizon-bin
defaultMode: 0555
{{- if $mounts_horizon_db_sync.volumes }}{{ toYaml $mounts_horizon_db_sync.volumes | indent 6 }}{{ end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.pdb }}
{{- $envAll := . }}
---
apiVersion: policy/v1beta1
@@ -23,3 +24,4 @@ spec:
selector:
matchLabels:
{{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.secret_db }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
@@ -24,3 +25,4 @@ type: Opaque
data:
DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service_ingress }}
{{- $envAll := . }}
{{- if .Values.network.ingress.public }}
---
@@ -26,3 +27,4 @@ spec:
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if .Values.manifests.service }}
{{- $envAll := . }}
---
apiVersion: v1
@@ -37,3 +38,4 @@ spec:
{{ if .Values.network.enable_node_port }}
type: NodePort
{{ end }}
{{- end }}

View File

@@ -24,6 +24,8 @@ images:
dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
pull_policy: "IfNotPresent"
release_group: null
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@@ -174,3 +176,15 @@ endpoints:
port:
mysql:
default: 3306
manifests:
configmap_bin: true
configmap_etc: true
deployment: true
ingress_api: true
job_db_init: true
job_db_sync: true
pdb: true
secret_db: true
service_ingress: true
service: true

Some files were not shown because too many files have changed in this diff Show More