openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Remove Api version requirement for CronJob Curator"

Browse Source
This commit is contained in:
Zuul 2018-03-08 23:11:48 +00:00 committed by Gerrit Code Review
commit 0dfdaf52c2
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/templates/cron-job-curator.yaml
View File

@ -15,14 +15,13 @@ limitations under the License.
*/}}
{{- if .Values.manifests.cron_curator }}
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
{{- $envAll := . }}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.curator -}}
{{- $serviceAccountName := "elastic-curator"}}
{{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: batch/v2alpha1
apiVersion: batch/v1beta1
kind: CronJob
metadata:
name: elastic-curator
@ -72,4 +71,3 @@ spec:
name: elasticsearch-etc
defaultMode: 0444
{{- end }}
{{- end }}

1
tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/templates/kubeadm-conf.yaml.j2
View File

@ -31,7 +31,6 @@ token: {{ kubeadm_bootstrap_token }}
tokenTTL: 24h0m0s
selfHosted: {{ k8s.selfHosted }}
apiServerExtraArgs:
runtime-config: "batch/v2alpha1=true"
service-node-port-range: "1024-65535"
controllerManagerExtraArgs:
address: "0.0.0.0"