Merge "Rally: Update chart"

This commit is contained in:
Zuul 2018-10-01 13:19:59 +00:00 committed by Gerrit Code Review
commit 093a8ae0e2
4 changed files with 6 additions and 158 deletions

View File

@ -1,60 +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.
*/}}
{{- if .Values.manifests.ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.rally.ingress.public }}
{{- $backendServiceType := "benchmark" }}
{{- $backendPort := "rally" }}
{{- $ingressName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
{{- $hostName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
{{- $hostNameNamespaced := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
{{- $hostNameFull := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ $ingressName }}
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/rewrite-target: /
nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.network.rally.ingress.proxy_body_size }}
spec:
rules:
{{ if ne $hostNameNamespaced $hostNameFull }}
{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
- host: {{ $vHost }}
http:
paths:
- path: /
backend:
serviceName: {{ $backendName }}
servicePort: {{ $backendPort }}
{{- end }}
{{- else }}
{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced }}
- host: {{ $vHost }}
http:
paths:
- path: /
backend:
serviceName: {{ $backendName }}
servicePort: {{ $backendPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

View File

@ -1,32 +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.
*/}}
{{- if .Values.manifests.service_ingress_api }}
{{- $envAll := . }}
{{- if .Values.network.rally.ingress.public }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ tuple "benchmark" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
spec:
ports:
- name: http
port: 80
selector:
app: ingress-api
{{- end }}
{{- end }}

View File

@ -1,36 +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.
*/}}
{{- if .Values.manifests.service }}
{{- $envAll := . }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ tuple "benchmark" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
spec:
ports:
- name: rally
port: {{ .Values.conf.rally.rally_api.bind_port }}
{{ if .Values.network.rally.node_port.enabled }}
nodePort: .Values.network.rally.node_port.port
{{ end }}
selector:
{{ tuple $envAll "rally" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.rally.node_port.enabled }}
type: NodePort
{{ end }}
{{- end }}

View File

@ -34,7 +34,6 @@ images:
ks_user: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton
ks_endpoints: docker.io/openstackhelm/heat:newton
api: docker.io/kolla/ubuntu-source-rally:3.0.3
image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent"
local_registry:
@ -44,16 +43,19 @@ images:
- image_repo_sync
enabled_tasks:
# - ceilometer -NOTE(alraddarla): not enabled
# NOTE(alraddarla): not enabled
# - ceilometerNOTE(alraddarla): not enabled
- cinder
- glance
- heat
- keystone
- magnum
# - neutron NOTE(alraddarla): need a network setup in the gate to fully test
# NOTE(alraddarla): need a network setup in the gate to fully test
# - neutron
- nova
- senlin
# - swift NOTE(alraddarla): not enabled
# NOTE(alraddarla): not enabled
# - swift
pod:
affinity:
@ -69,19 +71,6 @@ pod:
rally_bootstrap:
init_container: null
rally_bootstrap:
replicas:
rally: 1
lifecycle:
upgrades:
deployments:
revision_history: 3
pod_replacement_strategy: RollingUpdate
rolling_update:
max_unavailable: 1
max_surge: 3
disruption_budget:
rally:
min_available: 0
resources:
enabled: false
jobs:
@ -142,15 +131,6 @@ pod:
memory: "1024Mi"
cpu: "2000m"
network:
rally:
ingress:
public: true
proxy_body_size: 1024M
node_port:
enabled: false
port: 39486
bootstrap:
enabled: false
script: |
@ -12902,7 +12882,6 @@ manifests:
configmap_etc: true
configmap_tasks: true
configmap_test_templates: true
ingress_api: true
job_bootstrap: true
job_db_init: true
job_image_repo_sync: true
@ -12911,9 +12890,6 @@ manifests:
job_ks_user: true
job_manage_db: true
job_run_task: true
pdb_api: true
pvc_rally: true
secret_db: true
secret_keystone: true
service_ingress_api: true
service: true