From 366a1754470985e7ab7536bdfcba8272a2efdcfe Mon Sep 17 00:00:00 2001 From: intlabs Date: Sun, 22 Oct 2017 09:49:52 -0500 Subject: [PATCH] Remove old helm-toolkit This PS removes the old helm toolkit in preperation for the repo to be initialised with openstack-helm-infra and the zuul v3 gate. Change-Id: I4fa3be6bc240c061620dc3b5533136107a99065c --- helm-toolkit/.gitignore | 3 - helm-toolkit/.helmignore | 27 ---- helm-toolkit/Chart.yaml | 18 --- helm-toolkit/Makefile | 21 --- helm-toolkit/requirements.lock | 3 - helm-toolkit/requirements.yaml | 15 -- .../_authenticated_endpoint_uri_lookup.tpl | 45 ------ .../endpoints/_endpoint_port_lookup.tpl | 34 ---- .../_host_and_port_endpoint_uri_lookup.tpl | 40 ----- .../_hostname_fqdn_endpoint_lookup.tpl | 35 ----- .../_hostname_short_endpoint_lookup.tpl | 31 ---- .../_keystone_endpoint_name_lookup.tpl | 26 ---- .../_keystone_endpoint_path_lookup.tpl | 30 ---- .../_keystone_endpoint_uri_lookup.tpl | 38 ----- .../templates/scripts/_db-init.py.tpl | 147 ------------------ .../templates/scripts/_ks-domain-user.sh.tpl | 71 --------- .../templates/scripts/_ks-endpoints.sh.tpl | 79 ---------- .../templates/scripts/_ks-service.sh.tpl | 51 ------ .../templates/scripts/_ks-user.sh.tpl | 83 ---------- .../templates/scripts/_rally_test.sh.tpl | 28 ---- .../snippets/_k8s_init_dep_check.tpl | 46 ------ .../snippets/_k8s_metadata_labels.tpl | 22 --- .../snippets/_k8s_pod_antiaffinity.tpl | 38 ----- .../templates/snippets/_ks_env_openrc.tpl | 54 ------- .../snippets/_ks_env_user_create_openrc.tpl | 47 ------ .../utils/_comma_joined_hostname_list.tpl | 19 --- helm-toolkit/templates/utils/_hash.tpl | 21 --- .../templates/utils/_joinListWithComma.tpl | 17 -- helm-toolkit/templates/utils/_template.tpl | 21 --- helm-toolkit/templates/utils/_to_ini.tpl | 28 ---- helm-toolkit/values.yaml | 26 ---- tools/gate/setup_gate.sh | 4 + 32 files changed, 4 insertions(+), 1164 deletions(-) delete mode 100644 helm-toolkit/.gitignore delete mode 100644 helm-toolkit/.helmignore delete mode 100644 helm-toolkit/Chart.yaml delete mode 100644 helm-toolkit/Makefile delete mode 100644 helm-toolkit/requirements.lock delete mode 100644 helm-toolkit/requirements.yaml delete mode 100644 helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_endpoint_port_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_keystone_endpoint_path_lookup.tpl delete mode 100644 helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl delete mode 100644 helm-toolkit/templates/scripts/_db-init.py.tpl delete mode 100644 helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl delete mode 100755 helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl delete mode 100644 helm-toolkit/templates/scripts/_ks-service.sh.tpl delete mode 100644 helm-toolkit/templates/scripts/_ks-user.sh.tpl delete mode 100644 helm-toolkit/templates/scripts/_rally_test.sh.tpl delete mode 100644 helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl delete mode 100644 helm-toolkit/templates/snippets/_k8s_metadata_labels.tpl delete mode 100644 helm-toolkit/templates/snippets/_k8s_pod_antiaffinity.tpl delete mode 100644 helm-toolkit/templates/snippets/_ks_env_openrc.tpl delete mode 100644 helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl delete mode 100644 helm-toolkit/templates/utils/_comma_joined_hostname_list.tpl delete mode 100644 helm-toolkit/templates/utils/_hash.tpl delete mode 100644 helm-toolkit/templates/utils/_joinListWithComma.tpl delete mode 100644 helm-toolkit/templates/utils/_template.tpl delete mode 100644 helm-toolkit/templates/utils/_to_ini.tpl delete mode 100644 helm-toolkit/values.yaml create mode 100755 tools/gate/setup_gate.sh diff --git a/helm-toolkit/.gitignore b/helm-toolkit/.gitignore deleted file mode 100644 index e1bd7e85a..000000000 --- a/helm-toolkit/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -secrets/* -!secrets/.gitkeep -templates/_secrets.tpl diff --git a/helm-toolkit/.helmignore b/helm-toolkit/.helmignore deleted file mode 100644 index e8ef5ffab..000000000 --- a/helm-toolkit/.helmignore +++ /dev/null @@ -1,27 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj - -bin/ -etc/ -patches/ -*.py -Makefile diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml deleted file mode 100644 index d853b797e..000000000 --- a/helm-toolkit/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2017 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. - -apiVersion: v1 -description: A base chart for all openstack charts -name: helm-toolkit -version: 0.1.0 diff --git a/helm-toolkit/Makefile b/helm-toolkit/Makefile deleted file mode 100644 index 9662e57a8..000000000 --- a/helm-toolkit/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 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. - -EXCLUDE := templates/* charts/* Chart.yaml requirement* values.yaml Makefile utils/* helm-toolkit/Chart.yaml -SECRETS := $(shell find secrets -type f $(foreach e,$(EXCLUDE), -not -path "$(e)") ) - -templates/_secrets.tpl: Makefile $(SECRETS) - echo Generating $(CURDIR)/$@ - rm -f $@ - for i in $(SECRETS); do printf '{{ define "'$$i'" }}' >> $@; cat $$i >> $@; printf "{{ end }}\n" >> $@; done diff --git a/helm-toolkit/requirements.lock b/helm-toolkit/requirements.lock deleted file mode 100644 index 4728ad100..000000000 --- a/helm-toolkit/requirements.lock +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: [] -digest: sha256:81059fe6210ccee4e3349c0f34c12d180f995150128a913d63b65b7937c6b152 -generated: 2017-06-29T14:28:07.637890135-05:00 diff --git a/helm-toolkit/requirements.yaml b/helm-toolkit/requirements.yaml deleted file mode 100644 index 7a4ed34ee..000000000 --- a/helm-toolkit/requirements.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2017 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. - -dependencies: [] diff --git a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl deleted file mode 100644 index 4f4a8f02c..000000000 --- a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2017 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. - -# This function helps resolve database style endpoints: -# -# Presuming that .Values contains an endpoint: definition for 'neutron-db' with the -# appropriate attributes, a call such as: -# { tuple "neutron-db" "internal" "userClass" "portName" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" } -# where portName is optional if a default port has been defined in .Values -# returns: mysql+pymysql://username:password@internal_host:3306/dbname - -{{- define "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $userclass := index . 2 -}} -{{- $port := index . 3 -}} -{{- $context := index . 4 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $userMap := index $endpointMap.auth $userclass }} -{{- $fqdn := default "svc.cluster.local" $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointUser := index $userMap "username" }} -{{- $endpointPass := index $userMap "password" }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} -{{- $endpointPortMAP := index .port $port }} -{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} -{{- $endpointPath := .path | default "" }} -{{- printf "%s://%s:%s@%s.%s:%1.f%s" $endpointScheme $endpointUser $endpointPass $endpointHost $fqdn $endpointPort $endpointPath -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_endpoint_port_lookup.tpl b/helm-toolkit/templates/endpoints/_endpoint_port_lookup.tpl deleted file mode 100644 index 8b8f7d80c..000000000 --- a/helm-toolkit/templates/endpoints/_endpoint_port_lookup.tpl +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2017 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. - -# This function returns hostnames from endpoint definitions for use cases -# where the uri style return is not appropriate, and only the hostname -# portion is used or relevant in the template: -# { tuple "memcache" "internal" "portName" . | include "helm-toolkit.endpoints.endpoint_port_lookup" } -# returns: internal_host:port -# -# Output that requires the port aspect striped could simply split the output based on ':' - -{{- define "helm-toolkit.endpoints.endpoint_port_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $port := index . 2 -}} -{{- $context := index . 3 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- with $endpointMap -}} -{{- $endpointPortMAP := index .port $port }} -{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} -{{- printf "%1.f" $endpointPort -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl deleted file mode 100644 index b4cd0448d..000000000 --- a/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2017 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. - -# This function returns hostnames from endpoint definitions for use cases -# where the uri style return is not appropriate, and only the hostname -# portion is used or relevant in the template: -# { tuple "memcache" "internal" "portName" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" } -# returns: internal_host:port -# -# Output that requires the port aspect striped could simply split the output based on ':' - -{{- define "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $port := index . 2 -}} -{{- $context := index . 3 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $fqdn := default "svc.cluster.local" $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default }} -{{- $endpointPortMAP := index .port $port }} -{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} -{{- printf "%s.%s:%1.f" $endpointHost $fqdn $endpointPort -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl b/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl deleted file mode 100644 index 9f0640ab6..000000000 --- a/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2017 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. - -# This function returns hostnames from endpoint definitions for use cases -# where the uri style return is not appropriate, and only the hostname -# portion is used or relevant in the template: -# { tuple "memcache" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" } -# returns: internal_host_fqdn - -{{- define "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $context := index . 2 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $fqdn := default "svc.cluster.local" $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default }} -{{- printf "%s.%s" $endpointHost $fqdn -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl b/helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl deleted file mode 100644 index 1eaaa9471..000000000 --- a/helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2017 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. - -# This function returns hostnames from endpoint definitions for use cases -# where the uri style return is not appropriate, and only the short hostname or -# kubernetes servicename is used or relevant in the template: -# { tuple "memcache" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" } -# returns: the short internal hostname, which will also match the service name - -{{- define "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $context := index . 2 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} -{{- printf "%s" $endpointHost -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl b/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl deleted file mode 100644 index ff51995a7..000000000 --- a/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2017 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. - -# This function is used in endpoint management templates -# it returns the service type for an openstack service eg: -# { tuple orchestration . | include "keystone_endpoint_name_lookup" } -# will return "heat" - -{{- define "helm-toolkit.endpoints.keystone_endpoint_name_lookup" -}} -{{- $type := index . 0 -}} -{{- $context := index . 1 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $endpointName := index $endpointMap "name" }} -{{- $endpointName | quote -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_path_lookup.tpl b/helm-toolkit/templates/endpoints/_keystone_endpoint_path_lookup.tpl deleted file mode 100644 index f85cbeb5f..000000000 --- a/helm-toolkit/templates/endpoints/_keystone_endpoint_path_lookup.tpl +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2017 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. - -# This function returns the path for a service, it takes an tuple -# input in the form: service-type, endpoint-class, port-name. eg: -# { tuple "orchestration" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_path_lookup" } -# will return the appropriate path. - -{{- define "helm-toolkit.endpoints.keystone_endpoint_path_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $port := index . 2 -}} -{{- $context := index . 3 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- with $endpointMap -}} -{{- $endpointPath := index .path $endpoint | default .path.default | default "/" }} -{{- printf "%s" $endpointPath -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl deleted file mode 100644 index 1115b8517..000000000 --- a/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2017 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. - -# This function returns the endpoint uri for a service, it takes an tuple -# input in the form: service-type, endpoint-class, port-name. eg: -# { tuple "orchestration" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" } -# will return the appropriate URI. - -{{- define "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $port := index . 2 -}} -{{- $context := index . 3 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $fqdn := default "svc.cluster.local" $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := index .scheme $endpoint | default .scheme.default }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default }} -{{- $endpointPortMAP := index .port $port }} -{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} -{{- $endpointPath := index .path $endpoint | default .path.default | default "/" }} -{{- printf "%s://%s.%s:%1.f%s" $endpointScheme $endpointHost $fqdn $endpointPort $endpointPath -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/scripts/_db-init.py.tpl b/helm-toolkit/templates/scripts/_db-init.py.tpl deleted file mode 100644 index cccb62dec..000000000 --- a/helm-toolkit/templates/scripts/_db-init.py.tpl +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.scripts.db_init" }} -#!/usr/bin/env python - -# Creates db and user for an OpenStack Service: -# Set ROOT_DB_CONNECTION and DB_CONNECTION environment variables to contain -# SQLAlchemy strings for the root connection to the database and the one you -# wish the service to use. Alternatively, you can use an ini formatted config -# at the location specified by OPENSTACK_CONFIG_FILE, and extract the string -# from the key OPENSTACK_CONFIG_DB_KEY, in the section specified by -# OPENSTACK_CONFIG_DB_SECTION. - -import os -import sys -import ConfigParser -import logging -from sqlalchemy import create_engine - -# Create logger, console handler and formatter -logger = logging.getLogger('OpenStack-Helm DB Init') -logger.setLevel(logging.DEBUG) -ch = logging.StreamHandler() -ch.setLevel(logging.DEBUG) -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - -# Set the formatter and add the handler -ch.setFormatter(formatter) -logger.addHandler(ch) - - -# Get the connection string for the service db root user -if "ROOT_DB_CONNECTION" in os.environ: - db_connection = os.environ['ROOT_DB_CONNECTION'] - logger.info('Got DB root connection') -else: - logger.critical('environment variable ROOT_DB_CONNECTION not set') - sys.exit(1) - -# Get the connection string for the service db -if "OPENSTACK_CONFIG_FILE" in os.environ: - try: - os_conf = os.environ['OPENSTACK_CONFIG_FILE'] - if "OPENSTACK_CONFIG_DB_SECTION" in os.environ: - os_conf_section = os.environ['OPENSTACK_CONFIG_DB_SECTION'] - else: - logger.critical('environment variable OPENSTACK_CONFIG_DB_SECTION not set') - sys.exit(1) - if "OPENSTACK_CONFIG_DB_KEY" in os.environ: - os_conf_key = os.environ['OPENSTACK_CONFIG_DB_KEY'] - else: - logger.critical('environment variable OPENSTACK_CONFIG_DB_KEY not set') - sys.exit(1) - config = ConfigParser.RawConfigParser() - logger.info("Using {0} as db config source".format(os_conf)) - config.read(os_conf) - logger.info("Trying to load db config from {0}:{1}".format( - os_conf_section, os_conf_key)) - user_db_conn = config.get(os_conf_section, os_conf_key) - logger.info("Got config from {0}".format(os_conf)) - except: - logger.critical("Tried to load config from {0} but failed.".format(os_conf)) - sys.exit(1) -elif "DB_CONNECTION" in os.environ: - user_db_conn = os.environ['DB_CONNECTION'] - logger.info('Got config from DB_CONNECTION env var') -else: - logger.critical('Could not get db config, either from config file or env var') - sys.exit(1) - -# Root DB engine -try: - root_engine_full = create_engine(db_connection) - root_user = root_engine_full.url.username - root_password = root_engine_full.url.password - drivername = root_engine_full.url.drivername - host = root_engine_full.url.host - port = root_engine_full.url.port - root_engine_url = ''.join([drivername, '://', root_user, ':', root_password, '@', host, ':', str (port)]) - root_engine = create_engine(root_engine_url) - connection = root_engine.connect() - connection.close() - logger.info("Tested connection to DB @ {0}:{1} as {2}".format( - host, port, root_user)) -except: - logger.critical('Could not connect to database as root user') - raise - sys.exit(1) - -# User DB engine -try: - user_engine = create_engine(user_db_conn) - # Get our user data out of the user_engine - database = user_engine.url.database - user = user_engine.url.username - password = user_engine.url.password - logger.info('Got user db config') -except: - logger.critical('Could not get user database config') - raise - sys.exit(1) - -# Create DB -try: - root_engine.execute("CREATE DATABASE IF NOT EXISTS {0}".format(database)) - logger.info("Created database {0}".format(database)) -except: - logger.critical("Could not create database {0}".format(database)) - raise - sys.exit(1) - -# Create DB User -try: - root_engine.execute( - "GRANT ALL ON `{0}`.* TO \'{1}\'@\'%%\' IDENTIFIED BY \'{2}\'".format( - database, user, password)) - logger.info("Created user {0} for {1}".format(user, database)) -except: - logger.critical("Could not create user {0} for {1}".format(user, database)) - raise - sys.exit(1) - -# Test connection -try: - connection = user_engine.connect() - connection.close() - logger.info("Tested connection to DB @ {0}:{1}/{2} as {3}".format( - host, port, database, user)) -except: - logger.critical('Could not connect to database as user') - raise - sys.exit(1) - -logger.info('Finished DB Management') -{{- end }} diff --git a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl deleted file mode 100644 index 0680f91cc..000000000 --- a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.scripts.keystone_domain_user" }} -#!/bin/bash - -# Copyright 2017 Pete Birley -# -# 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. - -set -ex - -# Manage domain -SERVICE_OS_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \ - --description="Service Domain for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_DOMAIN_NAME}" \ - "${SERVICE_OS_DOMAIN_NAME}") - -# Display domain -openstack domain show "${SERVICE_OS_DOMAIN_ID}" - -# Manage user -SERVICE_OS_USERID=$(openstack user create --or-show --enable -f value -c id \ - --domain="${SERVICE_OS_DOMAIN_ID}" \ - --description "Service User for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_DOMAIN_NAME}" \ - --password="${SERVICE_OS_PASSWORD}" \ - "${SERVICE_OS_USERNAME}") - -# Display user -openstack user show "${SERVICE_OS_USERID}" - -# Manage role -SERVICE_OS_ROLE_ID=$(openstack role show -f value -c id \ - --domain="${SERVICE_OS_DOMAIN_ID}" \ - "${SERVICE_OS_ROLE}" || openstack role create -f value -c id \ - --domain="${SERVICE_OS_DOMAIN_ID}" \ - "${SERVICE_OS_ROLE}" ) - -# Manage user role assignment -openstack role add \ - --domain="${SERVICE_OS_DOMAIN_ID}" \ - --user="${SERVICE_OS_USERID}" \ - --user-domain="${SERVICE_OS_DOMAIN_ID}" \ - "${SERVICE_OS_ROLE_ID}" - -# Display user role assignment -openstack role assignment list \ - --role="${SERVICE_OS_ROLE_ID}" \ - --user-domain="${SERVICE_OS_DOMAIN_ID}" \ - --user="${SERVICE_OS_USERID}" -{{- end }} diff --git a/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl b/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl deleted file mode 100755 index 0c19a85eb..000000000 --- a/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.scripts.keystone_endpoints" }} -#!/bin/bash - -# Copyright 2017 Pete Birley -# -# 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. - -set -ex - -# Get Service ID -OS_SERVICE_ID=$( openstack service list -f csv --quote none | \ - grep ",${OS_SERVICE_NAME},${OS_SERVICE_TYPE}$" | \ - sed -e "s/,${OS_SERVICE_NAME},${OS_SERVICE_TYPE}//g" ) - -# Get Endpoint ID if it exists -OS_ENDPOINT_ID=$( openstack endpoint list -f csv --quote none | \ - grep "^[a-z0-9]*,${OS_REGION_NAME},${OS_SERVICE_NAME},${OS_SERVICE_TYPE},True,${OS_SVC_ENDPOINT}," | \ - awk -F ',' '{ print $1 }' ) - -# Making sure only a single endpoint exists for a service within a region -if [ "$(echo $OS_ENDPOINT_ID | wc -w)" -gt "1" ]; then - echo "More than one endpoint found, cleaning up" - for ENDPOINT_ID in $OS_ENDPOINT_ID; do - openstack endpoint delete ${ENDPOINT_ID} - done - unset OS_ENDPOINT_ID -fi - -# Determine if Endpoint needs updated -if [[ ${OS_ENDPOINT_ID} ]]; then - OS_ENDPOINT_URL_CURRENT=$(openstack endpoint show ${OS_ENDPOINT_ID} --f value -c url) - if [ "${OS_ENDPOINT_URL_CURRENT}" == "${OS_SERVICE_ENDPOINT}" ]; then - echo "Endpoints Match: no action required" - OS_ENDPOINT_UPDATE="False" - else - echo "Endpoints Dont Match: removing existing entries" - openstack endpoint delete ${OS_ENDPOINT_ID} - OS_ENDPOINT_UPDATE="True" - fi -else - OS_ENDPOINT_UPDATE="True" -fi - -# Update Endpoint if required -if [[ "${OS_ENDPOINT_UPDATE}" == "True" ]]; then - OS_ENDPOINT_ID=$( openstack endpoint create -f value -c id \ - --region="${OS_REGION_NAME}" \ - "${OS_SERVICE_ID}" \ - ${OS_SVC_ENDPOINT} \ - "${OS_SERVICE_ENDPOINT}" ) -fi - -# Display the Endpoint -openstack endpoint show ${OS_ENDPOINT_ID} -{{- end }} diff --git a/helm-toolkit/templates/scripts/_ks-service.sh.tpl b/helm-toolkit/templates/scripts/_ks-service.sh.tpl deleted file mode 100644 index ea812e883..000000000 --- a/helm-toolkit/templates/scripts/_ks-service.sh.tpl +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.scripts.keystone_service" }} -#!/bin/bash - -# Copyright 2017 Pete Birley -# -# 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. - -set -ex - -# Service boilerplate description -OS_SERVICE_DESC="${OS_REGION_NAME}: ${OS_SERVICE_NAME} (${OS_SERVICE_TYPE}) service" - -# Get Service ID if it exists -unset OS_SERVICE_ID -OS_SERVICE_ID=$( openstack service list -f csv --quote none | \ - grep ",${OS_SERVICE_NAME},${OS_SERVICE_TYPE}$" | \ - sed -e "s/,${OS_SERVICE_NAME},${OS_SERVICE_TYPE}//g" ) - -# If a Service ID was not found, then create the service -if [[ -z ${OS_SERVICE_ID} ]]; then - OS_SERVICE_ID=$(openstack service create -f value -c id \ - --name="${OS_SERVICE_NAME}" \ - --description "${OS_SERVICE_DESC}" \ - --enable \ - "${OS_SERVICE_TYPE}") -fi -{{- end }} diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-user.sh.tpl deleted file mode 100644 index 71121a387..000000000 --- a/helm-toolkit/templates/scripts/_ks-user.sh.tpl +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.scripts.keystone_user" }} -#!/bin/bash - -# Copyright 2017 Pete Birley -# -# 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. - -set -ex - -# Manage user project -USER_PROJECT_DESC="Service Project for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_PROJECT_DOMAIN_NAME}" -USER_PROJECT_ID=$(openstack project create --or-show --enable -f value -c id \ - --domain="${SERVICE_OS_PROJECT_DOMAIN_NAME}" \ - --description="${USER_PROJECT_DESC}" \ - "${SERVICE_OS_PROJECT_NAME}"); - -# Display project -openstack project show "${USER_PROJECT_ID}" - -# Manage user -USER_DESC="Service User for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_USER_DOMAIN_NAME}/${SERVICE_OS_SERVICE_NAME}" -USER_ID=$(openstack user create --or-show --enable -f value -c id \ - --domain="${SERVICE_OS_USER_DOMAIN_NAME}" \ - --project-domain="${SERVICE_OS_PROJECT_DOMAIN_NAME}" \ - --project="${USER_PROJECT_ID}" \ - --description="${USER_DESC}" \ - --password="${SERVICE_OS_PASSWORD}" \ - "${SERVICE_OS_USERNAME}"); - -# Display user -openstack user show "${USER_ID}" - -function ks_assign_user_role () { - # Manage user role assignment - openstack role add \ - --user="${USER_ID}" \ - --user-domain="${SERVICE_OS_USER_DOMAIN_NAME}" \ - --project-domain="${SERVICE_OS_PROJECT_DOMAIN_NAME}" \ - --project="${USER_PROJECT_ID}" \ - "${USER_ROLE_ID}" - - # Display user role assignment - openstack role assignment list \ - --role="${USER_ROLE_ID}" \ - --user-domain="${SERVICE_OS_USER_DOMAIN_NAME}" \ - --user="${USER_ID}" -} - -# Manage user service role -export USER_ROLE_ID=$(openstack role create --or-show -f value -c id \ - "${SERVICE_OS_ROLE}"); -ks_assign_user_role - -# Manage user member role -: ${MEMBER_OS_ROLE:="_member_"} -export USER_ROLE_ID=$(openstack role create --or-show -f value -c id \ - "${MEMBER_OS_ROLE}"); -ks_assign_user_role -{{- end }} diff --git a/helm-toolkit/templates/scripts/_rally_test.sh.tpl b/helm-toolkit/templates/scripts/_rally_test.sh.tpl deleted file mode 100644 index 4c8cf6ab5..000000000 --- a/helm-toolkit/templates/scripts/_rally_test.sh.tpl +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.scripts.rally_test" }} -#!/bin/bash -set -ex - -: ${RALLY_ENV_NAME:="openstack-helm"} -rally-manage db create -rally deployment create --fromenv --name ${RALLY_ENV_NAME} -rally deployment use ${RALLY_ENV_NAME} -rally deployment check -rally task validate /etc/rally/rally_tests.yaml -rally task start /etc/rally/rally_tests.yaml -rally deployment destroy --deployment ${RALLY_ENV_NAME} -rally task sla-check -{{- end }} diff --git a/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl b/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl deleted file mode 100644 index 4c0b7623c..000000000 --- a/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.snippets.kubernetes_entrypoint_init_container" -}} -{{- $envAll := index . 0 -}} -{{- $deps := index . 1 -}} -{{- $mounts := index . 2 -}} -- name: init - image: {{ $envAll.Values.images.dep_check }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} - env: - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: INTERFACE_NAME - value: eth0 - - name: DEPENDENCY_SERVICE - value: "{{ tuple $deps.services $envAll | include "helm-toolkit.utils.comma_joined_hostname_list" }}" - - name: DEPENDENCY_JOBS - value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.jobs }}" - - name: DEPENDENCY_DAEMONSET - value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" - - name: DEPENDENCY_CONTAINER - value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.container }}" - - name: COMMAND - value: "echo done" - volumeMounts: {{ $mounts | default "[]"}} -{{- end -}} diff --git a/helm-toolkit/templates/snippets/_k8s_metadata_labels.tpl b/helm-toolkit/templates/snippets/_k8s_metadata_labels.tpl deleted file mode 100644 index 1fad10fad..000000000 --- a/helm-toolkit/templates/snippets/_k8s_metadata_labels.tpl +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.snippets.kubernetes_metadata_labels" -}} -{{- $envAll := index . 0 -}} -{{- $application := index . 1 -}} -{{- $component := index . 2 -}} -release_name: {{ $envAll.Release.Name }} -application: {{ $application }} -component: {{ $component }} -{{- end -}} diff --git a/helm-toolkit/templates/snippets/_k8s_pod_antiaffinity.tpl b/helm-toolkit/templates/snippets/_k8s_pod_antiaffinity.tpl deleted file mode 100644 index 6fc572c26..000000000 --- a/helm-toolkit/templates/snippets/_k8s_pod_antiaffinity.tpl +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.snippets.kubernetes_pod_anti_affinity" -}} -{{- $envAll := index . 0 -}} -{{- $application := index . 1 -}} -{{- $component := index . 2 -}} -podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchExpressions: - - key: release_name - operator: In - values: - - {{ $envAll.Release.Name }} - - key: application - operator: In - values: - - {{ $application }} - - key: component - operator: In - values: - - {{ $component }} - topologyKey: kubernetes.io/hostname - weight: 10 -{{- end -}} diff --git a/helm-toolkit/templates/snippets/_ks_env_openrc.tpl b/helm-toolkit/templates/snippets/_ks_env_openrc.tpl deleted file mode 100644 index 285650138..000000000 --- a/helm-toolkit/templates/snippets/_ks_env_openrc.tpl +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.snippets.keystone_openrc_env_vars" }} -{{- $ksUserSecret := .ksUserSecret }} -- name: OS_IDENTITY_API_VERSION - value: "3" -- name: OS_AUTH_URL - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_AUTH_URL -- name: OS_REGION_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_REGION_NAME -- name: OS_PROJECT_DOMAIN_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_PROJECT_DOMAIN_NAME -- name: OS_PROJECT_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_PROJECT_NAME -- name: OS_USER_DOMAIN_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_USER_DOMAIN_NAME -- name: OS_USERNAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_USERNAME -- name: OS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_PASSWORD -{{- end }} diff --git a/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl b/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl deleted file mode 100644 index f9a73e7b0..000000000 --- a/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.snippets.keystone_user_create_env_vars" }} -{{- $ksUserSecret := .ksUserSecret }} -- name: SERVICE_OS_REGION_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_REGION_NAME -- name: SERVICE_OS_PROJECT_DOMAIN_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_PROJECT_DOMAIN_NAME -- name: SERVICE_OS_PROJECT_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_PROJECT_NAME -- name: SERVICE_OS_USER_DOMAIN_NAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_USER_DOMAIN_NAME -- name: SERVICE_OS_USERNAME - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_USERNAME -- name: SERVICE_OS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $ksUserSecret }} - key: OS_PASSWORD -{{- end }} diff --git a/helm-toolkit/templates/utils/_comma_joined_hostname_list.tpl b/helm-toolkit/templates/utils/_comma_joined_hostname_list.tpl deleted file mode 100644 index a9820571d..000000000 --- a/helm-toolkit/templates/utils/_comma_joined_hostname_list.tpl +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.utils.comma_joined_hostname_list" -}} -{{- $deps := index . 0 -}} -{{- $envAll := index . 1 -}} -{{- range $k, $v := $deps -}}{{- if $k -}},{{- end -}}{{ tuple $v.service $v.endpoint $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}{{- end -}} -{{- end -}} diff --git a/helm-toolkit/templates/utils/_hash.tpl b/helm-toolkit/templates/utils/_hash.tpl deleted file mode 100644 index 110990bbe..000000000 --- a/helm-toolkit/templates/utils/_hash.tpl +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.utils.hash" -}} -{{- $name := index . 0 -}} -{{- $context := index . 1 -}} -{{- $last := base $context.Template.Name }} -{{- $wtf := $context.Template.Name | replace $last $name -}} -{{- include $wtf $context | sha256sum | quote -}} -{{- end -}} diff --git a/helm-toolkit/templates/utils/_joinListWithComma.tpl b/helm-toolkit/templates/utils/_joinListWithComma.tpl deleted file mode 100644 index 2a7c691ca..000000000 --- a/helm-toolkit/templates/utils/_joinListWithComma.tpl +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.utils.joinListWithComma" -}} -{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }} -{{- end -}} diff --git a/helm-toolkit/templates/utils/_template.tpl b/helm-toolkit/templates/utils/_template.tpl deleted file mode 100644 index d3f6cda32..000000000 --- a/helm-toolkit/templates/utils/_template.tpl +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.utils.template" -}} -{{- $name := index . 0 -}} -{{- $context := index . 1 -}} -{{- $last := base $context.Template.Name }} -{{- $wtf := $context.Template.Name | replace $last $name -}} -{{ include $wtf $context }} -{{- end -}} diff --git a/helm-toolkit/templates/utils/_to_ini.tpl b/helm-toolkit/templates/utils/_to_ini.tpl deleted file mode 100644 index f8f4a369c..000000000 --- a/helm-toolkit/templates/utils/_to_ini.tpl +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2017 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. - -{{- define "helm-toolkit.utils.to_ini" -}} -{{- range $section, $values := . -}} -{{- if kindIs "map" $values -}} -[{{ $section }}] -{{range $key, $value := $values -}} -{{- if kindIs "slice" $value -}} -{{ $key }} = {{ include "helm-toolkit.joinListWithComma" $value }} -{{else -}} -{{ $key }} = {{ $value }} -{{end -}} -{{- end -}} -{{- end -}} -{{- end -}} -{{- end -}} diff --git a/helm-toolkit/values.yaml b/helm-toolkit/values.yaml deleted file mode 100644 index 9a2b0c22d..000000000 --- a/helm-toolkit/values.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2017 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. - -# Default values for utils. -# This is a YAML-formatted file. -# Declare name/value pairs to be passed into your templates. -# name: value - -global: - region: cluster - tld: local - -endpoints: - fqdn: null - diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh new file mode 100755 index 000000000..8ea8556f8 --- /dev/null +++ b/tools/gate/setup_gate.sh @@ -0,0 +1,4 @@ +#!/bin/bash +#NOTE(portdirect): stub gate to make legacy v2 gates pass. +echo 'THIS IS NOT A VALID TEST!' +exit 0