airship/porthole
Code Issues Proposed changes

Enable Deployment configuration consistency across all UC

Browse Source 
Change-Id: I037912a47a1ece600497d0930a5a1ce96d730eb6
This commit is contained in:
dt241s@att.com 2020-05-03 10:13:46 -05:00 committed by dt241s
parent 2cc7de4c57
commit 8a59fb9804
25 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/ceph-utility/templates/configmap-bin.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }}
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/ceph-utility/templates/configmap-etc-client.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if or (.Values.deployment.ceph) (.Values.deployment.client_secrets) }}
{{- if .Values.manifests.configmap_etc_client }}
{{- $envAll := . }}
---

2
charts/ceph-utility/templates/configmap-etc-sudoers.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.ceph }}
{{- if .Values.manifests.configmap_etc_sudoers }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/ceph-utility/templates/deployment-utility.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.deployment_utility ( and .Values.deployment.ceph .Values.conf.features.utility) }}
{{- if .Values.manifests.deployment_utility }}
{{- $envAll := . }}
{{- $serviceAccountName := printf "%s" $envAll.Release.Name }}

3
charts/ceph-utility/values.yaml
View File

@ -17,9 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
deployment:
ceph: true
release_group: null
images:

2
charts/compute-utility/templates/configmap-bin.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_bin .Values.deployment.compute }}
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/compute-utility/templates/configmap-etc-client.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_client .Values.deployment.compute }}
{{- if .Values.manifests.configmap_etc_client }}
{{- $envAll := . }}
---

2
charts/compute-utility/templates/configmap-etc-sudoers.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.compute }}
{{- if .Values.manifests.configmap_etc_sudoers }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/compute-utility/templates/deployment-utility.yaml
View File

@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.deployment_utility ( and .Values.deployment.compute .Values.conf.features.utility) }}
{{- if .Values.manifests.deployment_utility }}
{{- $envAll := . }}
{{- $serviceAccountName := printf "%s" $envAll.Release.Name }}

4
charts/compute-utility/values.yaml
View File

@ -17,10 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
deployment:
compute: true
release_group: null
release_uuid: null

2
charts/mysqlclient-utility/templates/configmap-bin.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_bin .Values.deployment.mysqlclient }}
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/mysqlclient-utility/templates/configmap-etc-client.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_client .Values.deployment.mysqlclient }}
{{- if .Values.manifests.configmap_etc_client }}
{{- $envAll := . }}
---

2
charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.mysqlclient }}
{{- if .Values.manifests.configmap_etc_sudoers }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/mysqlclient-utility/templates/deployment-utility.yaml
View File

@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.deployment_utility ( and .Values.deployment.mysqlclient .Values.conf.features.utility) }}
{{- if .Values.manifests.deployment_utility }}
{{- $envAll := . }}
{{- $serviceAccountName := printf "%s" $envAll.Release.Name }}

3
charts/mysqlclient-utility/values.yaml
View File

@ -17,9 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
deployment:
mysqlclient: true
release_group: null
images:

2
charts/openstack-utility/templates/configmap-bin.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_bin .Values.deployment.openstack }}
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/openstack-utility/templates/configmap-etc-client.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_client .Values.deployment.openstack }}
{{- if .Values.manifests.configmap_etc_client }}
{{- $envAll := . }}
---

2
charts/openstack-utility/templates/configmap-etc-sudoers.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.openstack }}
{{- if .Values.manifests.configmap_etc_sudoers }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/openstack-utility/templates/deployment-utility.yaml
View File

@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.deployment_utility ( and .Values.deployment.openstack) }}
{{- if .Values.manifests.deployment_utility }}
{{- $envAll := . }}
{{- $serviceAccountName := printf "%s" $envAll.Release.Name }}

3
charts/openstack-utility/values.yaml
View File

@ -4,9 +4,6 @@
# name: value
deployment:
openstack: true
release_group: null
images:

4
charts/postgresql-utility/templates/configmap-bin.yaml
View File

@ -1,4 +1,4 @@
{{- if and .Values.manifests.configmap_bin .Values.deployment.postgresql }}
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
---
apiVersion: v1
@ -25,4 +25,4 @@ data:
utilscli: |
{{ tuple "bin/utility/_utilscli.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

2
charts/postgresql-utility/templates/configmap-etc-client.yaml
View File

@ -1,4 +1,4 @@
{{- if or (.Values.deployment.postgresql) (.Values.deployment.client_secrets) }}
{{- if .Values.manifests.configmap_etc_client }}
{{- $envAll := . }}
---

2
charts/postgresql-utility/templates/configmap-etc-sudoers.yaml
View File

@ -1,4 +1,4 @@
{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.postgresql }}
{{- if .Values.manifests.configmap_etc_sudoers }}
{{- $envAll := . }}
---
apiVersion: v1

2
charts/postgresql-utility/templates/deployment-utility.yaml
View File

@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.deployment_utility ( and .Values.deployment.postgresql .Values.conf.features.utility) }}
{{- if .Values.manifests.deployment_utility }}
{{- $envAll := . }}
{{- $serviceAccountName := printf "%s" $envAll.Release.Name }}

3
charts/postgresql-utility/values.yaml
View File

@ -17,9 +17,6 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
deployment:
postgresql: true
release_group: null
images: