Enable 'platform-integ-apps' application support
This commit enables a new application tarball by: - adding existence through the stevedore plugin framework - register it as a system app to that system overrides can be generated - provide initial overrides for the rbd-provisioner and ceph_pools_audit charts - updates the rbd-provisioner to support installation of multiple provisioners in the same cluster. Change-Id: I34ad8789768bfd081ab2dcd45d110d9cd8349875 Depends-On: I0caaa878a6c6781d038b48b8caa2aa507ee9568a Story: 2005424 Task: 30646 Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
parent
f147e98eea
commit
a2c50e3130
|
@ -5,4 +5,4 @@ $PKG_BASE/../../../helm-charts/node-feature-discovery \
|
|||
$PKG_BASE/../../../helm-charts/rbd-provisioner \
|
||||
$PKG_BASE/../../../helm-charts/ceph-pools-audit"
|
||||
|
||||
TIS_PATCH_VER=2
|
||||
TIS_PATCH_VER=3
|
||||
|
|
|
@ -43,6 +43,5 @@ spec:
|
|||
{{- end }}
|
||||
env:
|
||||
- name: PROVISIONER_NAME
|
||||
value: ceph.com/rbd
|
||||
value: {{ .Values.global.provisioner_name }}
|
||||
{{- end}}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ spec:
|
|||
image: {{ .Values.images.tags.rbd_provisioner | quote }}
|
||||
env:
|
||||
- name: PROVISIONER_NAME
|
||||
value: ceph.com/rbd
|
||||
value: {{ .Values.global.provisioner_name }}
|
||||
{{- if .Values.global.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{ .Values.global.nodeSelector | toYaml | trim | indent 8 }}
|
||||
|
|
|
@ -9,12 +9,13 @@
|
|||
{{- if .Values.global.provisionStorageClass }}
|
||||
{{ $namespace := .Release.Namespace }}
|
||||
{{ $defaults := .Values.classdefaults}}
|
||||
{{ $provisioner := .Values.global.provisioner_name }}
|
||||
{{- range $classConfig := .Values.classes }}
|
||||
apiVersion: storage.k8s.io/v1
|
||||
kind: StorageClass
|
||||
metadata:
|
||||
name: {{ $classConfig.name }}
|
||||
provisioner: ceph.com/rbd
|
||||
provisioner: {{ $provisioner }}
|
||||
parameters:
|
||||
monitors: {{ $monitors := or $classConfig.monitors $defaults.monitors }}{{ join "," $monitors}}
|
||||
adminId: {{ or $classConfig.adminId $defaults.adminId}}
|
||||
|
@ -27,4 +28,4 @@ parameters:
|
|||
imageFeatures: {{ or $classConfig.imageFeatures $defaults.imageFeatures}}
|
||||
---
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
@ -9,10 +9,14 @@
|
|||
# Defaults should be fine in most cases.
|
||||
global:
|
||||
#
|
||||
# Defines the name of a Provisioner.
|
||||
# Defines the application name of the provisioner.
|
||||
#
|
||||
name: "rbd-provisioner"
|
||||
#
|
||||
# Defines the name of the provisioner associated with a set of storage classes
|
||||
#
|
||||
provisioner_name: "ceph.com/rbd"
|
||||
#
|
||||
# Execute initialization job to verify external Ceph cluster access
|
||||
# and setup additional dependencies assumed by dependent helm charts
|
||||
# (i.e. configmap and secrets).
|
||||
|
|
|
@ -37,10 +37,10 @@ data:
|
|||
labels:
|
||||
app: rbd-provisioner
|
||||
values:
|
||||
images:
|
||||
tags:
|
||||
# TODO: Remove after ceph upgrade
|
||||
rbd_provisioner_storage_init: docker.io/starlingx/stx-ceph-config-helper:master-centos-stable-latest
|
||||
global:
|
||||
# TODO (rchurch): Remove after enabling the stx-openstack application to
|
||||
# use the default system provisioner.
|
||||
provisioner_name: "ceph.com/rbd-platform"
|
||||
rbac:
|
||||
clusterRole: stx-rbd-provisioner
|
||||
clusterRoleBinding: stx-rbd-provisioner
|
||||
|
|
Loading…
Reference in New Issue