Browse Source
Upgrade openstack-helm-infra to below version. commit 34d54f2812b7d54431d548cff08fe8da7f838124 Date: Sat Apr 11 15:24:54 2020 +0200 Cleanup py27 support and docs Below 3 patches are removed as they are already merged. Allow-multiple-containers-per-daemonset-pod.patch Add-TLS-support-for-Gnocchi-public-endpoint.patch Update ingress chart for Helm v3 Story: 2007474 Task: 39394 Change-Id: Icf624c8a0a6c74c8cfdb75ad45162e4a7aa5e404 Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>changes/35/720135/14
Zhipeng Liu
2 years ago
15 changed files with 34 additions and 210 deletions
@ -1,8 +1,8 @@
|
||||
TAR_NAME=openstack-helm-infra |
||||
SHA=c9d6676bf9a5aceb311dc31dadd07cba6a3d6392 |
||||
SHA=34d54f2812b7d54431d548cff08fe8da7f838124 |
||||
VERSION=1.0.0 |
||||
TAR="$TAR_NAME-$SHA.tar.gz" |
||||
|
||||
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*" |
||||
|
||||
TIS_PATCH_VER=16 |
||||
TIS_PATCH_VER=17 |
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 47315e28d44cff586f6fff026dd00e61c2c77bcd Mon Sep 17 00:00:00 2001
|
||||
From: Gerry Kopec <Gerry.Kopec@windriver.com>
|
||||
Date: Wed, 9 Jan 2019 20:11:33 -0500
|
||||
Subject: [PATCH 1/4] Allow multiple containers per daemonset pod
|
||||
|
||||
Remove code that restricted daemonset pods to single containers.
|
||||
Container names will default to name from helm chart template.
|
||||
Required for nova cold migrations to work.
|
||||
|
||||
Story: 2003876
|
||||
Task: 26735
|
||||
Change-Id: Icce660415d43baefbbf768a785c5dedf04ea2930
|
||||
Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
|
||||
(cherry picked from commit 7ca30319f418cd39db5ecf44cce5fb5fe39c458e)
|
||||
Signed-off-by: Robert Church <robert.church@windriver.com>
|
||||
---
|
||||
helm-toolkit/templates/utils/_daemonset_overrides.tpl | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
||||
index e352bc9..10ab166 100644
|
||||
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
||||
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
||||
@@ -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 }}
|
||||
|
||||
- {{/* set container name
|
||||
- assume not more than one container is defined */}}
|
||||
- {{- $container := first $context.Values.__daemonset_yaml.spec.template.spec.containers }}
|
||||
- {{- $_ := set $container "name" $current_dict.dns_1123_name }}
|
||||
- {{- $cont_list := list $container }}
|
||||
- {{- $_ := set $context.Values.__daemonset_yaml.spec.template.spec "containers" $cont_list }}
|
||||
-
|
||||
{{/* cross-reference configmap name to container volume definitions */}}
|
||||
{{- $_ := set $context.Values "__volume_list" list }}
|
||||
{{- range $current_volume := $context.Values.__daemonset_yaml.spec.template.spec.volumes }}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
From e2e9b3c707599b4074ebf504f6a2fa5c185481e2 Mon Sep 17 00:00:00 2001
|
||||
From: Angie Wang <angie.wang@windriver.com>
|
||||
Date: Tue, 9 Jul 2019 13:37:29 -0400
|
||||
Subject: [PATCH 1/1] Add TLS support for Gnocchi public endpoint
|
||||
|
||||
Signed-off-by: Angie Wang <angie.wang@windriver.com>
|
||||
---
|
||||
gnocchi/templates/secret-ingress-tls.yaml | 19 +++++++++++++++++++
|
||||
gnocchi/values.yaml | 12 ++++++++++++
|
||||
2 files changed, 31 insertions(+)
|
||||
create mode 100644 gnocchi/templates/secret-ingress-tls.yaml
|
||||
|
||||
diff --git a/gnocchi/templates/secret-ingress-tls.yaml b/gnocchi/templates/secret-ingress-tls.yaml
|
||||
new file mode 100644
|
||||
index 0000000..fc279cd
|
||||
--- /dev/null
|
||||
+++ b/gnocchi/templates/secret-ingress-tls.yaml
|
||||
@@ -0,0 +1,19 @@
|
||||
+{{/*
|
||||
+Copyright 2019 Wind River Systems, Inc.
|
||||
+
|
||||
+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.secret_ingress_tls }}
|
||||
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "metric" ) }}
|
||||
+{{- end }}
|
||||
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
|
||||
index a4496b7..394e82a 100644
|
||||
--- a/gnocchi/values.yaml
|
||||
+++ b/gnocchi/values.yaml
|
||||
@@ -472,6 +472,10 @@ secrets:
|
||||
admin: gnocchi-db-indexer-admin
|
||||
gnocchi: gnocchi-db-indexer-user
|
||||
rbd: gnocchi-rbd-keyring
|
||||
+ tls:
|
||||
+ metric:
|
||||
+ api:
|
||||
+ public: gnocchi-tls-public
|
||||
|
||||
bootstrap:
|
||||
enabled: false
|
||||
@@ -538,6 +542,13 @@ endpoints:
|
||||
public: gnocchi
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
+ # NOTE: this chart supports TLS for fqdn over-ridden public
|
||||
+ # endpoints using the following format:
|
||||
+ # public:
|
||||
+ # host: null
|
||||
+ # tls:
|
||||
+ # crt: null
|
||||
+ # key: null
|
||||
path:
|
||||
default: null
|
||||
scheme:
|
||||
@@ -633,6 +644,7 @@ manifests:
|
||||
pod_gnocchi_test: true
|
||||
secret_db: true
|
||||
secret_keystone: true
|
||||
+ secret_ingress_tls: true
|
||||
service_api: true
|
||||
service_ingress_api: true
|
||||
service_statsd: true
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From 06ca3c8594c73d2aacc3958f6e94a4911e2caa8a Mon Sep 17 00:00:00 2001
|
||||
From: Jim Gauld <james.gauld@windriver.com>
|
||||
Date: Mon, 6 Apr 2020 09:17:47 -0400
|
||||
Subject: [PATCH] Update ingress chart for Helm v3
|
||||
|
||||
---
|
||||
ingress/Chart.yaml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/ingress/Chart.yaml b/ingress/Chart.yaml
|
||||
index 70d7467..a9030e2 100644
|
||||
--- a/ingress/Chart.yaml
|
||||
+++ b/ingress/Chart.yaml
|
||||
@@ -12,6 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
+apiVersion: v1
|
||||
description: OpenStack-Helm Ingress Controller
|
||||
name: ingress
|
||||
version: 0.1.0
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Loading…
Reference in new issue