starlingx
/
openstack-armada-app
Code Issues Proposed changes

Merge "Upgrade openstack-helm-infra"

This commit is contained in:
Zuul 2019-11-12 17:29:37 +00:00 committed by Gerrit Code Review
parent 80ab4d348b 7d9ce6ed97
commit 0188ea27c7
9 changed files with 43 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack-helm-infra/centos/build_srpm.data
View File

@ -1,8 +1,8 @@
TAR_NAME=openstack-helm-infra
SHA=aae64213c95fbcea7a0a7671dcb9d8a366f16fa5
SHA=c9d6676bf9a5aceb311dc31dadd07cba6a3d6392
VERSION=1.0.0
TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*"
TIS_PATCH_VER=14
TIS_PATCH_VER=15

12
openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -1,4 +1,4 @@
%global sha aae64213c95fbcea7a0a7671dcb9d8a366f16fa5
%global sha c9d6676bf9a5aceb311dc31dadd07cba6a3d6392
%global helm_folder /usr/lib/helm
Summary: Openstack-Helm-Infra charts
@ -19,11 +19,10 @@ Patch01: 0001-Allow-multiple-containers-per-daemonset-pod.patch
Patch02: 0002-Add-imagePullSecrets-in-service-account.patch
Patch03: 0003-Set-Min-NGINX-handles.patch
Patch04: 0004-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
Patch05: 0005-Add-a-configmap-for-ingress-controller-config.patch
Patch06: 0006-Add-TLS-support-for-Gnocchi-public-endpoint.patch
Patch07: 0007-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch
Patch08: 0008-Add-io_thread_pool-for-rabbitmq.patch
Patch09: 0009-Enable-override-of-rabbitmq-probe-parameters.patch
Patch05: 0005-Add-TLS-support-for-Gnocchi-public-endpoint.patch
Patch06: 0006-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch
Patch07: 0007-Add-io_thread_pool-for-rabbitmq.patch
Patch08: 0008-Enable-override-of-rabbitmq-probe-parameters.patch
BuildRequires: helm
@ -40,7 +39,6 @@ Openstack Helm Infra charts
%patch06 -p1
%patch07 -p1
%patch08 -p1
%patch09 -p1
%build
# initialize helm and build the toolkit

6
openstack-helm-infra/files/0001-Allow-multiple-containers-per-daemonset-pod.patch
View File

@ -18,10 +18,10 @@ Signed-off-by: Robert Church <robert.church@windriver.com>
1 file changed, 7 deletions(-)
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
index 743bd6b..c02de9e 100644
index e352bc9..10ab166 100644
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
@@ -223,13 +223,6 @@ limitations under the License.
@@ -225,13 +225,6 @@ limitations under the License.
{{- if not $context.Values.__daemonset_yaml.metadata.name }}{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" dict }}{{- end }}
{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" $current_dict.dns_1123_name }}
@ -36,5 +36,5 @@ index 743bd6b..c02de9e 100644
{{- $_ := set $context.Values "__volume_list" list }}
{{- range $current_volume := $context.Values.__daemonset_yaml.spec.template.spec.volumes }}
--
2.16.5
2.7.4

24
openstack-helm-infra/files/0004-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
View File

@ -13,36 +13,36 @@ Signed-off-by: Robert Church <robert.church@windriver.com>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
index c02de9e..ef52592 100644
index 10ab166..ab1177a 100644
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
@@ -48,10 +48,10 @@ limitations under the License.
{{/* apply overrides */}}
@@ -49,10 +49,10 @@ limitations under the License.
{{- $override_conf_copy := $host_data.conf }}
{{- $root_conf_copy := omit $context.Values.conf "overrides" }}
{{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
{{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
- {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
+ {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
{{- $root_conf_copy2 := dict "conf" $merged_dict }}
{{- $context_values := omit $context.Values "conf" }}
{{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
@@ -87,10 +87,10 @@ limitations under the License.
{{/* apply overrides */}}
@@ -89,10 +89,10 @@ limitations under the License.
{{- $override_conf_copy := $label_data.conf }}
{{- $root_conf_copy := omit $context.Values.conf "overrides" }}
{{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
{{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
- {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
+ {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
{{- $root_conf_copy2 := dict "conf" $merged_dict }}
{{- $context_values := omit $context.Values "conf" }}
{{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}
@@ -185,7 +185,7 @@ limitations under the License.
@@ -187,7 +187,7 @@ limitations under the License.
{{- $root_conf_copy1 := omit $context.Values.conf "overrides" }}
{{- $root_conf_copy2 := dict "conf" $root_conf_copy1 }}
{{- $context_values := omit $context.Values "conf" }}
@ -51,7 +51,7 @@ index c02de9e..ef52592 100644
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $context.Values.__default "nodeData" $root_conf_copy4 }}
@@ -196,7 +196,7 @@ limitations under the License.
@@ -198,7 +198,7 @@ limitations under the License.
{{- range $current_dict := $context.Values.__daemonset_list }}
{{- $context_novalues := omit $context "Values" }}
@ -61,5 +61,5 @@ index c02de9e..ef52592 100644
{{/* Deep copy original daemonset_yaml */}}
{{- $_ := set $context.Values "__daemonset_yaml" ($daemonset_yaml | toYaml | fromYaml) }}
--
2.16.5
2.7.4

10
openstack-helm-infra/files/0006-Add-TLS-support-for-Gnocchi-public-endpoint.patch → openstack-helm-infra/files/0005-Add-TLS-support-for-Gnocchi-public-endpoint.patch
View File

@ -36,10 +36,10 @@ index 0000000..fc279cd
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "metric" ) }}
+{{- end }}
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 2d5f48b..73e245f 100644
index a4496b7..394e82a 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -470,6 +470,10 @@ secrets:
@@ -472,6 +472,10 @@ secrets:
admin: gnocchi-db-indexer-admin
gnocchi: gnocchi-db-indexer-user
rbd: gnocchi-rbd-keyring
@ -50,7 +50,7 @@ index 2d5f48b..73e245f 100644
bootstrap:
enabled: false
@@ -536,6 +540,13 @@ endpoints:
@@ -538,6 +542,13 @@ endpoints:
public: gnocchi
host_fqdn_override:
default: null
@ -64,7 +64,7 @@ index 2d5f48b..73e245f 100644
path:
default: null
scheme:
@@ -631,6 +642,7 @@ manifests:
@@ -633,6 +644,7 @@ manifests:
pod_gnocchi_test: true
secret_db: true
secret_keystone: true
@ -73,5 +73,5 @@ index 2d5f48b..73e245f 100644
service_ingress_api: true
service_statsd: true
--
1.8.3.1
2.7.4

82
openstack-helm-infra/files/0005-Add-a-configmap-for-ingress-controller-config.patch
View File

@ -1,82 +0,0 @@
From 9fd9b6276bfd41a01c73321e141ef1d14fcdd15c Mon Sep 17 00:00:00 2001
From: Yi Wang <yi.c.wang@intel.com>
Date: Fri, 17 May 2019 14:56:04 +0800
Subject: [PATCH] Add a configmap for ingress controller config
Signed-off-by: Yi Wang <yi.c.wang@intel.com>
---
.../bin/_mariadb-ingress-controller.sh.tpl | 1 +
mariadb/templates/configmap-ingress-conf.yaml | 27 +++++++++++++++++++
mariadb/values.yaml | 3 +++
3 files changed, 31 insertions(+)
create mode 100755 mariadb/templates/configmap-ingress-conf.yaml
diff --git a/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl b/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl
index af6e0c0..f214ec3 100644
--- a/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl
+++ b/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl
@@ -27,6 +27,7 @@ function start () {
--election-id=${RELEASE_NAME} \
--ingress-class=${INGRESS_CLASS} \
--default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
+ --configmap=${POD_NAMESPACE}/mariadb-ingress-conf \
--tcp-services-configmap=${POD_NAMESPACE}/mariadb-services-tcp
}
diff --git a/mariadb/templates/configmap-ingress-conf.yaml b/mariadb/templates/configmap-ingress-conf.yaml
new file mode 100755
index 0000000..64ffdd1
--- /dev/null
+++ b/mariadb/templates/configmap-ingress-conf.yaml
@@ -0,0 +1,27 @@
+{{/*
+Copyright 2019 The Openstack-Helm Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 .Values.manifests.configmap_ingress_conf }}
+{{- $envAll := . }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: mariadb-ingress-conf
+data:
+{{ toYaml .Values.conf.ingress_conf | indent 2 }}
+{{- end }}
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index c0a928e..ca9788b 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -200,6 +200,8 @@ jobs:
conf:
ingress: null
+ ingress_conf:
+ worker-processes: "auto"
backup:
enabled: true
base_path: /var/backup
@@ -322,6 +324,7 @@ network_policy:
manifests:
configmap_bin: true
configmap_etc: true
+ configmap_ingress_conf: true
configmap_services_tcp: true
deployment_error: true
deployment_ingress: true
--
2.17.1

8
openstack-helm-infra/files/0007-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch → openstack-helm-infra/files/0006-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch
View File

@ -9,10 +9,10 @@ Subject: [PATCH] Fix pod restarts on all workers when worker added/removed
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
index ef52592..d7194af 100644
index ab1177a..e564869 100644
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
@@ -213,7 +213,7 @@ limitations under the License.
@@ -215,7 +215,7 @@ limitations under the License.
name uniqueness */}}
{{- $_ := set $current_dict "dns_1123_name" dict }}
{{- if hasKey $current_dict "matchExpressions" }}
@ -21,7 +21,7 @@ index ef52592..d7194af 100644
{{- else }}
{{- $_ := set $current_dict "dns_1123_name" $name_format2 }}
{{- end }}
@@ -256,7 +256,7 @@ limitations under the License.
@@ -258,7 +258,7 @@ limitations under the License.
{{- if not $context.Values.__daemonset_yaml.spec.template.metadata }}{{- $_ := set $context.Values.__daemonset_yaml.spec.template "metadata" dict }}{{- end }}
{{- if not $context.Values.__daemonset_yaml.spec.template.metadata.annotations }}{{- $_ := set $context.Values.__daemonset_yaml.spec.template.metadata "annotations" dict }}{{- end }}
{{- $cmap := list $current_dict.dns_1123_name $current_dict.nodeData | include $configmap_include }}
@ -42,5 +42,5 @@ index 1041ec0..e419e3b 100644
+{{- include $wtf $context | toJson | sha256sum | quote -}}
{{- end -}}
--
1.8.3.1
2.7.4

14
openstack-helm-infra/files/0008-Add-io_thread_pool-for-rabbitmq.patch → openstack-helm-infra/files/0007-Add-io_thread_pool-for-rabbitmq.patch
View File

@ -10,10 +10,10 @@ Signed-off-by: Bin Yang <bin.yang@intel.com>
2 files changed, 12 insertions(+)
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 1016f7f..afe5520 100644
index 41dc198..e0e61e6 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -111,6 +111,10 @@ spec:
@@ -105,6 +105,10 @@ spec:
key: RABBITMQ_ADMIN_PASSWORD
- name: RABBITMQ_DEFINITION_FILE
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
@ -22,9 +22,9 @@ index 1016f7f..afe5520 100644
+ value: {{ $envAll.Values.io_thread_pool.size | quote }}
+{{- end }}
volumeMounts:
- name: rabbitmq-data
mountPath: /var/lib/rabbitmq
@@ -190,6 +194,10 @@ spec:
- name: pod-tmp
mountPath: /tmp
@@ -191,6 +195,10 @@ spec:
value: "{{ tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
- name: PORT_CLUSTERING
value: "{{ add (tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") 20000 }}"
@ -36,10 +36,10 @@ index 1016f7f..afe5520 100644
initialDelaySeconds: 10
timeoutSeconds: 10
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index bdc730a..367058e 100644
index 6c95787..9cd3a91 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -290,6 +290,10 @@ volume:
@@ -334,6 +334,10 @@ volume:
class_name: general
size: 256Mi

10
openstack-helm-infra/files/0009-Enable-override-of-rabbitmq-probe-parameters.patch → openstack-helm-infra/files/0008-Enable-override-of-rabbitmq-probe-parameters.patch
View File

@ -14,10 +14,10 @@ Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index afe5520..7b57c64 100644
index e0e61e6..f71dc3e 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -199,14 +199,16 @@ spec:
@@ -200,14 +200,16 @@ spec:
value: {{ $envAll.Values.io_thread_pool.size | quote }}
{{- end }}
readinessProbe:
@ -39,10 +39,10 @@ index afe5520..7b57c64 100644
command:
- /tmp/rabbitmq-liveness.sh
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 367058e..cfd151c 100644
index 9cd3a91..2bae4cb 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -102,6 +102,15 @@ pod:
@@ -145,6 +145,15 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
@ -59,5 +59,5 @@ index 367058e..cfd151c 100644
conf:
enabled_plugins:
--
1.8.3.1
2.7.4