Commit a3cf28cb by Caleb Bron

Istio 1.4.300

I know, the version looks wierd. But we needed to version our chart without making it terribly confusing for end users and also sticking to semver.
parent cf68b2b7
labels: labels:
rancher.istio.v1.4.3: 1.4.3 rancher.istio.v1.4.3: 1.4.3
rancher_min_version: 2.3.4-rc1 rancher_min_version: 2.3.4-rc1
rancher_max_version: 2.3.4-rc1
...@@ -14,4 +14,4 @@ name: rancher-istio ...@@ -14,4 +14,4 @@ name: rancher-istio
sources: sources:
- http://github.com/istio/istio - http://github.com/istio/istio
tillerVersion: '>=2.7.2-0' tillerVersion: '>=2.7.2-0'
version: 1.4.3 version: 1.4.300
...@@ -35,7 +35,11 @@ spec: ...@@ -35,7 +35,11 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: certmanager - name: certmanager
image: "{{ .Values.hub }}/{{ .Values.image }}:{{ .Values.tag }}" {{- if .Values.global.systemDefaultRegistry }}
image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
{{- else }}
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args: args:
- --cluster-resource-namespace=$(POD_NAMESPACE) - --cluster-resource-namespace=$(POD_NAMESPACE)
......
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
# restart, DestinationRules can be created using the ACME-signed certificates. # restart, DestinationRules can be created using the ACME-signed certificates.
enabled: false enabled: false
replicaCount: 1 replicaCount: 1
hub: quay.io/jetstack
image: cert-manager-controller
tag: v0.8.1
resources: {} resources: {}
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
......
...@@ -38,11 +38,7 @@ spec: ...@@ -38,11 +38,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: galley - name: galley
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.image }}:{{ .Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 443 - containerPort: 443
......
...@@ -5,7 +5,6 @@ enabled: true ...@@ -5,7 +5,6 @@ enabled: true
replicaCount: 1 replicaCount: 1
rollingMaxSurge: 100% rollingMaxSurge: 100%
rollingMaxUnavailable: 25% rollingMaxUnavailable: 25%
image: galley
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
podAnnotations: {} podAnnotations: {}
......
...@@ -44,7 +44,7 @@ spec: ...@@ -44,7 +44,7 @@ spec:
{{- if $.Values.global.proxy.enableCoreDump }} {{- if $.Values.global.proxy.enableCoreDump }}
initContainers: initContainers:
- name: enable-core-dump - name: enable-core-dump
image: {{ $.Values.global.proxy.enableCoreDumpImage }} image: "{{ template "system_default_registry" $ }}{{ $.Values.global.proxy_init.repository }}:{{ $.Values.global.proxy_init.tag }}"
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
command: command:
- /bin/sh - /bin/sh
...@@ -58,11 +58,7 @@ spec: ...@@ -58,11 +58,7 @@ spec:
{{- if $spec.sds }} {{- if $spec.sds }}
{{- if $spec.sds.enabled }} {{- if $spec.sds.enabled }}
- name: ingress-sds - name: ingress-sds
{{- if contains "/" $spec.sds.image }} image: "{{ template "system_default_registry" $ }}{{ $.Values.global.nodeagent.repository }}:{{ $.Values.global.nodeagent.tag }}"
image: "{{ $spec.sds.image }}"
{{- else }}
image: "{{ $.Values.global.hub }}/{{ $spec.sds.image }}:{{ $.Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
resources: resources:
{{- if $spec.sds.resources }} {{- if $spec.sds.resources }}
...@@ -86,11 +82,7 @@ spec: ...@@ -86,11 +82,7 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
- name: istio-proxy - name: istio-proxy
{{- if contains "/" $.Values.global.proxy.image }} image: "{{ template "system_default_registry" $ }}{{ $.Values.global.proxy.repository }}:{{ $.Values.global.proxy.tag }}"
image: "{{ $.Values.global.proxy.image }}"
{{- else }}
image: "{{ $.Values.global.hub }}/{{ $.Values.global.proxy.image }}:{{ $.Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
ports: ports:
{{- range $key, $val := $spec.ports }} {{- range $key, $val := $spec.ports }}
......
...@@ -17,7 +17,6 @@ istio-ingressgateway: ...@@ -17,7 +17,6 @@ istio-ingressgateway:
enabled: false enabled: false
# SDS server that watches kubernetes secrets and provisions credentials to ingress gateway. # SDS server that watches kubernetes secrets and provisions credentials to ingress gateway.
# This server runs in the same pod as ingress gateway. # This server runs in the same pod as ingress gateway.
image: node-agent-k8s
resources: resources:
requests: requests:
cpu: 100m cpu: 100m
......
...@@ -81,7 +81,7 @@ spec: ...@@ -81,7 +81,7 @@ spec:
serviceAccountName: istio-grafana-post-install-account serviceAccountName: istio-grafana-post-install-account
containers: containers:
- name: kubectl - name: kubectl
image: "{{ .Values.global.hub }}/kubectl:{{ .Values.global.tag }}" image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}"
command: [ "/bin/bash", "/tmp/grafana/run.sh", "/tmp/grafana/custom-resources.yaml" ] command: [ "/bin/bash", "/tmp/grafana/run.sh", "/tmp/grafana/custom-resources.yaml" ]
volumeMounts: volumeMounts:
- mountPath: "/tmp/grafana" - mountPath: "/tmp/grafana"
......
...@@ -38,7 +38,7 @@ spec: ...@@ -38,7 +38,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 3000 - containerPort: 3000
......
...@@ -19,7 +19,7 @@ spec: ...@@ -19,7 +19,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: "{{ template "grafana.fullname" . }}-test" - name: "{{ template "grafana.fullname" . }}-test"
image: pstauffer/curl:v1.0.3 image: "{{ template "system_default_registry" . }}{{ .Values.global.curl.repository }}:{{ .Values.global.curl.tag }}"
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
command: ['curl'] command: ['curl']
args: ['http://grafana:{{ .Values.grafana.service.externalPort }}'] args: ['http://grafana:{{ .Values.grafana.service.externalPort }}']
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
# #
enabled: false enabled: false
replicaCount: 1 replicaCount: 1
image:
repository: grafana/grafana
tag: 6.4.3
ingress: ingress:
enabled: false enabled: false
## Used to create an Ingress record. ## Used to create an Ingress record.
......
...@@ -13,7 +13,7 @@ data: ...@@ -13,7 +13,7 @@ data:
.:53 { .:53 {
errors errors
health health
{{ if eq -1 (semver .Values.coreDNSTag | (semver "1.4.0").Compare) }} {{ if eq -1 (semver .Values.image.tag | (semver "1.4.0").Compare) }}
# Removed support for the proxy plugin: https://coredns.io/2019/03/03/coredns-1.4.0-release/ # Removed support for the proxy plugin: https://coredns.io/2019/03/03/coredns-1.4.0-release/
grpc global 127.0.0.1:8053 grpc global 127.0.0.1:8053
forward . /etc/resolv.conf { forward . /etc/resolv.conf {
......
...@@ -37,7 +37,7 @@ spec: ...@@ -37,7 +37,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: coredns - name: coredns
image: {{ .Values.coreDNSImage }}:{{ .Values.coreDNSTag }} image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args: [ "-conf", "/etc/coredns/Corefile" ] args: [ "-conf", "/etc/coredns/Corefile" ]
volumeMounts: volumeMounts:
...@@ -71,7 +71,7 @@ spec: ...@@ -71,7 +71,7 @@ spec:
- name: istio-coredns-plugin - name: istio-coredns-plugin
command: command:
- /usr/local/bin/plugin - /usr/local/bin/plugin
image: {{ .Values.coreDNSPluginImage }} image: "{{ template "system_default_registry" . }}{{ .Values.pluginImage.repository }}:{{ .Values.pluginImage.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 8053 - containerPort: 8053
......
...@@ -5,12 +5,9 @@ enabled: false ...@@ -5,12 +5,9 @@ enabled: false
replicaCount: 1 replicaCount: 1
rollingMaxSurge: 100% rollingMaxSurge: 100%
rollingMaxUnavailable: 25% rollingMaxUnavailable: 25%
coreDNSImage: coredns/coredns
coreDNSTag: 1.6.2
# Source code for the plugin can be found at # Source code for the plugin can be found at
# https://github.com/istio-ecosystem/istio-coredns-plugin # https://github.com/istio-ecosystem/istio-coredns-plugin
# The plugin listens for DNS requests from coredns server at 127.0.0.1:8053 # The plugin listens for DNS requests from coredns server at 127.0.0.1:8053
coreDNSPluginImage: istio/coredns-plugin:0.2-istio-1.1
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
podAnnotations: {} podAnnotations: {}
......
...@@ -36,7 +36,7 @@ spec: ...@@ -36,7 +36,7 @@ spec:
priorityClassName: "{{ .Values.global.priorityClassName }}" priorityClassName: "{{ .Values.global.priorityClassName }}"
{{- end }} {{- end }}
containers: containers:
- image: "{{ .Values.hub }}/{{ .Values.image }}:{{ .Values.tag }}" - image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
name: kiali name: kiali
command: command:
......
...@@ -19,7 +19,7 @@ spec: ...@@ -19,7 +19,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: "{{ template "kiali.fullname" . }}-test" - name: "{{ template "kiali.fullname" . }}-test"
image: pstauffer/curl:v1.0.3 image: "{{ template "system_default_registry" . }}{{ .Values.global.curl.repository }}:{{ .Values.global.curl.tag }}"
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
command: ['curl'] command: ['curl']
args: ['http://kiali:20001'] args: ['http://kiali:20001']
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
# #
enabled: false # Note that if using the demo or demo-auth yaml when installing via Helm, this default will be `true`. enabled: false # Note that if using the demo or demo-auth yaml when installing via Helm, this default will be `true`.
replicaCount: 1 replicaCount: 1
hub: quay.io/kiali
image: kiali
tag: v1.9
contextPath: /kiali # The root context path to access the Kiali UI. contextPath: /kiali # The root context path to access the Kiali UI.
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
......
...@@ -39,11 +39,7 @@ ...@@ -39,11 +39,7 @@
{{- end }} {{- end }}
containers: containers:
- name: mixer - name: mixer
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ $.Values.repository }}:{{ $.Values.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ $.Values.global.hub }}/{{ $.Values.image }}:{{ $.Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
ports: ports:
- containerPort: {{ .Values.global.monitoringPort }} - containerPort: {{ .Values.global.monitoringPort }}
...@@ -111,11 +107,7 @@ ...@@ -111,11 +107,7 @@
initialDelaySeconds: 5 initialDelaySeconds: 5
periodSeconds: 5 periodSeconds: 5
- name: istio-proxy - name: istio-proxy
{{- if contains "/" $.Values.global.proxy.image }} image: "{{ template "system_default_registry" . }}{{ $.Values.global.proxy.repository }}:{{ $.Values.global.proxy.tag }}"
image: "{{ $.Values.global.proxy.image }}"
{{- else }}
image: "{{ $.Values.global.hub }}/{{ $.Values.global.proxy.image }}:{{ $.Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 9091 - containerPort: 9091
...@@ -233,11 +225,7 @@ ...@@ -233,11 +225,7 @@
{{- end }} {{- end }}
containers: containers:
- name: mixer - name: mixer
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ $.Values.repository }}:{{ $.Values.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ $.Values.global.hub }}/{{ $.Values.image }}:{{ $.Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
ports: ports:
- containerPort: {{ .Values.global.monitoringPort }} - containerPort: {{ .Values.global.monitoringPort }}
...@@ -314,11 +302,7 @@ ...@@ -314,11 +302,7 @@
initialDelaySeconds: 5 initialDelaySeconds: 5
periodSeconds: 5 periodSeconds: 5
- name: istio-proxy - name: istio-proxy
{{- if contains "/" $.Values.global.proxy.image }} image: "{{ template "system_default_registry" . }}{{ $.Values.global.proxy.repository }}:{{ $.Values.global.proxy.tag }}"
image: "{{ $.Values.global.proxy.image }}"
{{- else }}
image: "{{ $.Values.global.hub }}/{{ $.Values.global.proxy.image }}:{{ $.Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ $.Values.global.imagePullPolicy }} imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 9091 - containerPort: 9091
......
# #
# mixer configuration # mixer configuration
# #
image: mixer
env: env:
# max procs should be ceil(cpu limit + 1) # max procs should be ceil(cpu limit + 1)
......
...@@ -30,11 +30,7 @@ spec: ...@@ -30,11 +30,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: nodeagent - name: nodeagent
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ $.Values.global.nodeagent.repository }}:{{ $.Values.global.nodeagent.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.image }}:{{ .Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
volumeMounts: volumeMounts:
- mountPath: /var/run/sds - mountPath: /var/run/sds
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# nodeagent configuration # nodeagent configuration
# #
enabled: false enabled: false
image: node-agent-k8s
env: env:
# name of authentication provider. # name of authentication provider.
CA_PROVIDER: "" CA_PROVIDER: ""
......
...@@ -45,11 +45,7 @@ spec: ...@@ -45,11 +45,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: discovery - name: discovery
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.image }}:{{ .Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args: args:
- "discovery" - "discovery"
...@@ -131,11 +127,7 @@ spec: ...@@ -131,11 +127,7 @@ spec:
{{- end }} {{- end }}
{{- if .Values.sidecar }} {{- if .Values.sidecar }}
- name: istio-proxy - name: istio-proxy
{{- if contains "/" .Values.global.proxy.image }} image: "{{ template "system_default_registry" . }}{{ .Values.global.proxy.repository }}:{{ .Values.global.proxy.tag }}"
image: "{{ .Values.global.proxy.image }}"
{{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image }}:{{ .Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 15003 - containerPort: 15003
......
...@@ -9,7 +9,6 @@ autoscaleMax: 5 ...@@ -9,7 +9,6 @@ autoscaleMax: 5
# replicaCount: 1 # replicaCount: 1
rollingMaxSurge: 100% rollingMaxSurge: 100%
rollingMaxUnavailable: 25% rollingMaxUnavailable: 25%
image: pilot
sidecar: true sidecar: true
traceSampling: 1.0 traceSampling: 1.0
# if protocol sniffing is enabled for outbound # if protocol sniffing is enabled for outbound
......
...@@ -30,7 +30,7 @@ spec: ...@@ -30,7 +30,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: prometheus - name: prometheus
image: "{{ .Values.hub }}/{{ .Values.image }}:{{ .Values.tag }}" image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args: args:
- '--storage.tsdb.retention={{ .Values.retention }}' - '--storage.tsdb.retention={{ .Values.retention }}'
......
...@@ -19,7 +19,7 @@ spec: ...@@ -19,7 +19,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: "{{ template "prometheus.fullname" . }}-test" - name: "{{ template "prometheus.fullname" . }}-test"
image: pstauffer/curl:v1.0.3 image: {{ template "system_default_registry" . }}{{ .Values.global.curl.repository }}:{{ .Values.global.curl.tag }}
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
command: ['sh', '-c', 'for i in 1 2 3; do curl http://prometheus:9090/-/ready && exit 0 || sleep 15; done; exit 1'] command: ['sh', '-c', 'for i in 1 2 3; do curl http://prometheus:9090/-/ready && exit 0 || sleep 15; done; exit 1']
restartPolicy: Never restartPolicy: Never
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
# #
enabled: true enabled: true
replicaCount: 1 replicaCount: 1
hub: docker.io/prom
image: prometheus
tag: v2.12.0
retention: 6h retention: 6h
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
......
...@@ -85,7 +85,7 @@ spec: ...@@ -85,7 +85,7 @@ spec:
serviceAccountName: istio-security-post-install-account serviceAccountName: istio-security-post-install-account
containers: containers:
- name: kubectl - name: kubectl
image: "{{ .Values.global.hub }}/istio-kubectl:{{ .Values.global.tag }}" image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: [ "/bin/bash", "/tmp/security/run.sh", "/tmp/security/custom-resources.yaml" ] command: [ "/bin/bash", "/tmp/security/run.sh", "/tmp/security/custom-resources.yaml" ]
volumeMounts: volumeMounts:
......
...@@ -39,11 +39,7 @@ spec: ...@@ -39,11 +39,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: citadel - name: citadel
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.image }}:{{ .Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args: args:
{{- if .Values.global.sds.enabled }} {{- if .Values.global.sds.enabled }}
......
...@@ -19,7 +19,7 @@ spec: ...@@ -19,7 +19,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: "{{ template "security.fullname" . }}-test" - name: "{{ template "security.fullname" . }}-test"
image: pstauffer/curl:v1.0.3 image: "{{ template "system_default_registry" . }}{{ .Values.global.curl.repository }}:{{ .Values.global.curl.tag }}"
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
command: ['sh', '-c', 'for i in 1 2 3; do curl http://istio-citadel:{{ .Values.global.monitoringPort }}/version && exit 0 || sleep 15; done; exit 1'] command: ['sh', '-c', 'for i in 1 2 3; do curl http://istio-citadel:{{ .Values.global.monitoringPort }}/version && exit 0 || sleep 15; done; exit 1']
restartPolicy: Never restartPolicy: Never
......
...@@ -5,7 +5,6 @@ enabled: true ...@@ -5,7 +5,6 @@ enabled: true
replicaCount: 1 replicaCount: 1
rollingMaxSurge: 100% rollingMaxSurge: 100%
rollingMaxUnavailable: 25% rollingMaxUnavailable: 25%
image: citadel
selfSigned: true # indicate if self-signed CA is used. selfSigned: true # indicate if self-signed CA is used.
createMeshPolicy: true createMeshPolicy: true
nodeSelector: {} nodeSelector: {}
......
...@@ -38,11 +38,7 @@ spec: ...@@ -38,11 +38,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: sidecar-injector-webhook - name: sidecar-injector-webhook
{{- if contains "/" .Values.image }} image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
image: "{{ .Values.image }}"
{{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.image }}:{{ .Values.global.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args: args:
- --caCertFile=/etc/istio/certs/root-cert.pem - --caCertFile=/etc/istio/certs/root-cert.pem
......
...@@ -5,7 +5,6 @@ enabled: true ...@@ -5,7 +5,6 @@ enabled: true
replicaCount: 1 replicaCount: 1
rollingMaxSurge: 100% rollingMaxSurge: 100%
rollingMaxUnavailable: 25% rollingMaxUnavailable: 25%
image: sidecar_injector
enableNamespacesByDefault: false enableNamespacesByDefault: false
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
......
...@@ -40,7 +40,7 @@ spec: ...@@ -40,7 +40,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: jaeger - name: jaeger
image: "{{ .Values.jaeger.hub }}/{{ .Values.jaeger.image }}:{{ .Values.jaeger.tag }}" image: "{{ template "system_default_registry" . }}{{ .Values.jaeger.repository }}:{{ .Values.jaeger.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports: ports:
- containerPort: 9411 - containerPort: 9411
......
...@@ -39,7 +39,7 @@ spec: ...@@ -39,7 +39,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: zipkin - name: zipkin
image: "{{ .Values.zipkin.hub }}/{{ .Values.zipkin.image }}:{{ .Values.zipkin.tag }}" image: "{{ template "system_default_registry" . }}{{ .Values.zipkin.repository }}:{{ .Values.zipkin.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }} imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports: ports:
- containerPort: {{ .Values.zipkin.queryPort }} - containerPort: {{ .Values.zipkin.queryPort }}
......
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: "{{ .Values.provider }}-test" - name: "{{ .Values.provider }}-test"
image: pstauffer/curl:v1.0.3 image: "{{ template "system_default_registry" . }}{{ .Values.global.curl.repository }}:{{ .Values.global.curl.tag }}"
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
command: ['curl'] command: ['curl']
{{- if eq .Values.provider "jaeger" }} {{- if eq .Values.provider "jaeger" }}
......
...@@ -29,9 +29,6 @@ podAntiAffinityLabelSelector: [] ...@@ -29,9 +29,6 @@ podAntiAffinityLabelSelector: []
podAntiAffinityTermLabelSelector: [] podAntiAffinityTermLabelSelector: []
jaeger: jaeger:
hub: docker.io/jaegertracing
image: all-in-one
tag: 1.14
podAnnotations: {} podAnnotations: {}
memory: memory:
max_traces: 50000 max_traces: 50000
...@@ -43,9 +40,6 @@ jaeger: ...@@ -43,9 +40,6 @@ jaeger:
zipkin: zipkin:
hub: docker.io/openzipkin
image: zipkin
tag: 2.14.2
podAnnotations: {} podAnnotations: {}
probeStartupDelay: 200 probeStartupDelay: 200
queryPort: 9411 queryPort: 9411
......
...@@ -12,7 +12,8 @@ global: ...@@ -12,7 +12,8 @@ global:
nodeagent: nodeagent:
enabled: true enabled: true
image: node-agent-k8s repository: rancher/istio-node-agent-k8s
tag: 1.4.3
env: env:
# The IP address and the port number of a publicly accessible example Vault server. # The IP address and the port number of a publicly accessible example Vault server.
CA_ADDR: "https://34.83.129.211:8200" CA_ADDR: "https://34.83.129.211:8200"
......
...@@ -20,7 +20,8 @@ global: ...@@ -20,7 +20,8 @@ global:
nodeagent: nodeagent:
enabled: true enabled: true
image: node-agent-k8s repository: rancher/istio-node-agent-k8s
tag: 1.4.3
env: env:
CA_PROVIDER: "GoogleCA" CA_PROVIDER: "GoogleCA"
CA_ADDR: "meshca.googleapis.com:443" CA_ADDR: "meshca.googleapis.com:443"
......
...@@ -4,11 +4,11 @@ initContainers: ...@@ -4,11 +4,11 @@ initContainers:
{{ if ne (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `NONE` }} {{ if ne (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `NONE` }}
{{- if not .Values.istio_cni.enabled }} {{- if not .Values.istio_cni.enabled }}
- name: istio-init - name: istio-init
{{- if contains "/" .Values.global.proxy_init.image }} {{- if .Values.global.systemDefaultRegistry }}
image: "{{ .Values.global.proxy_init.image }}" image: "{{ .Values.global.systemDefaultRegistry }}/{{ .Values.global.proxy_init.repository }}:{{ .Values.global.proxy_init.tag }}"
{{- else }} {{- else }}
image: "{{ .Values.global.hub }}/{{ .Values.global.proxy_init.image }}:{{ .Values.global.tag }}" image: "{{ .Values.global.proxy_init.repository }}:{{ .Values.global.proxy_init.tag }}"
{{- end }} {{- end }}
command: command:
- istio-iptables - istio-iptables
- "-p" - "-p"
...@@ -65,7 +65,11 @@ initContainers: ...@@ -65,7 +65,11 @@ initContainers:
- sysctl -w kernel.core_pattern=/var/lib/istio/core.proxy && ulimit -c unlimited - sysctl -w kernel.core_pattern=/var/lib/istio/core.proxy && ulimit -c unlimited
command: command:
- /bin/sh - /bin/sh
image: {{ $.Values.global.proxy.enableCoreDumpImage }} {{- if .Values.global.systemDefaultRegistry }}
image: "{{ .Values.global.systemDefaultRegistry }}/{{ .Values.global.proxy.enableCoreDumpImage }}"
{{- else }}
image: "{{ .Values.global.proxy.enableCoreDumpImage }}"
{{- end }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: {} resources: {}
securityContext: securityContext:
...@@ -84,10 +88,10 @@ initContainers: ...@@ -84,10 +88,10 @@ initContainers:
{{- end }} {{- end }}
containers: containers:
- name: istio-proxy - name: istio-proxy
{{- if contains "/" (annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image) }} {{- if .Values.global.systemDefaultRegistry }}
image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image }}" image: "{{ .Values.global.systemDefaultRegistry }}/{{ .Values.global.proxy.repository }}:{{ .Values.global.proxy.tag }}"
{{- else }} {{- else }}
image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.hub }}/{{ .Values.global.proxy.image }}:{{ .Values.global.tag }}" image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.repository}}:{{ .Values.global.proxy.tag }}"
{{- end }} {{- end }}
ports: ports:
- containerPort: 15090 - containerPort: 15090
......
labels: labels:
rancher.istio.v1.4.3: 1.4.3 rancher.istio.v1.4.300: 1.4.3
rancher_min_version: 2.3.4-rc1 rancher_min_version: 2.3.4-rc1
...@@ -37,3 +37,12 @@ Create a fully qualified configmap name. ...@@ -37,3 +37,12 @@ Create a fully qualified configmap name.
{{- define "istio.configmap.fullname" -}} {{- define "istio.configmap.fullname" -}}
{{- printf "%s-%s" .Release.Name "istio-mesh-config" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Release.Name "istio-mesh-config" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{- define "system_default_registry" -}}
{{- if .Values.global.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
{{- else -}}
{{- "" -}}
{{- end -}}
{{- end -}}
...@@ -17,7 +17,8 @@ global: ...@@ -17,7 +17,8 @@ global:
nodeagent: nodeagent:
enabled: true enabled: true
image: node-agent-k8s repository: rancher/istio-node-agent-k8s
tag: 1.4.3
env: env:
CA_PROVIDER: "Citadel" CA_PROVIDER: "Citadel"
CA_ADDR: "istio-citadel:8060" CA_ADDR: "istio-citadel:8060"
......
...@@ -14,7 +14,8 @@ global: ...@@ -14,7 +14,8 @@ global:
nodeagent: nodeagent:
enabled: true enabled: true
image: node-agent-k8s repository: rancher/istio-node-agent-k8s
tag: 1.4.3
env: env:
CA_PROVIDER: "Citadel" CA_PROVIDER: "Citadel"
CA_ADDR: "istio-citadel:8060" CA_ADDR: "istio-citadel:8060"
......
...@@ -14,7 +14,8 @@ global: ...@@ -14,7 +14,8 @@ global:
nodeagent: nodeagent:
enabled: true enabled: true
image: node-agent-k8s repository: rancher/istio-node-agent-k8s
tag: 1.4.3
env: env:
CA_PROVIDER: "Citadel" CA_PROVIDER: "Citadel"
CA_ADDR: "istio-citadel:8060" CA_ADDR: "istio-citadel:8060"
......
...@@ -22,7 +22,8 @@ gateways: ...@@ -22,7 +22,8 @@ gateways:
# charts/sidecarInjectorWebhook/values.yaml for detailed configuration # charts/sidecarInjectorWebhook/values.yaml for detailed configuration
# #
sidecarInjectorWebhook: sidecarInjectorWebhook:
image: istio-sidecar_injector repository: rancher/istio-sidecar_injector
tag: 1.4.3
enabled: true enabled: true
# #
...@@ -30,7 +31,8 @@ sidecarInjectorWebhook: ...@@ -30,7 +31,8 @@ sidecarInjectorWebhook:
# for detailed configuration # for detailed configuration
# #
galley: galley:
image: istio-galley repository: rancher/istio-galley
tag: 1.4.3
enabled: true enabled: true
# #
...@@ -38,7 +40,8 @@ galley: ...@@ -38,7 +40,8 @@ galley:
# #
# @see charts/mixer/values.yaml for all values # @see charts/mixer/values.yaml for all values
mixer: mixer:
image: istio-mixer repository: rancher/istio-mixer
tag: 1.4.3
policy: policy:
# if policy is enabled the global.disablePolicyChecks has affect. # if policy is enabled the global.disablePolicyChecks has affect.
enabled: true enabled: true
...@@ -50,35 +53,38 @@ mixer: ...@@ -50,35 +53,38 @@ mixer:
# #
# @see charts/pilot/values.yaml # @see charts/pilot/values.yaml
pilot: pilot:
image: istio-pilot repository: rancher/istio-pilot
tag: 1.4.3
enabled: true enabled: true
# #
# security configuration # security configuration
# #
security: security:
image: istio-citadel repository: rancher/istio-citadel
tag: 1.4.3
enabled: true enabled: true
# #
# nodeagent configuration # nodeagent configuration
# #
nodeagent: nodeagent:
image: istio-node-agent-k8s
enabled: false enabled: false
# #
# addon grafana configuration # addon grafana configuration
# #
grafana: grafana:
image: grafana-grafana repository: rancher/grafana-grafana
tag: 6.3.6
enabled: false enabled: false
# #
# addon prometheus configuration # addon prometheus configuration
# #
prometheus: prometheus:
image: prom-prometheus repository: rancher/prom-prometheus
tag: v2.12.0
enabled: false enabled: false
# #
...@@ -86,19 +92,19 @@ prometheus: ...@@ -86,19 +92,19 @@ prometheus:
# #
tracing: tracing:
jaeger: jaeger:
hub: docker.io/rancher repository: rancher/jaegertracing-all-in-one
image: jaegertracing-all-in-one tag: 1.14
zipkin: zipkin:
hub: docker.io/rancher repository: rancher/openzipkin-zipkin
image: openzipkin-zipkin tag: 2.14.2
enabled: false enabled: false
# #
# addon kiali tracing configuration # addon kiali tracing configuration
# #
kiali: kiali:
hub: docker.io/rancher repository: rancher/kiali-kiali
image: kiali-kiali tag: v1.9
contextPath: / contextPath: /
dashboard: dashboard:
jaegerURL: http://tracing.istio-system:80 jaegerURL: http://tracing.istio-system:80
...@@ -113,6 +119,9 @@ kiali: ...@@ -113,6 +119,9 @@ kiali:
# #
certmanager: certmanager:
enabled: false enabled: false
image:
repository: rancher/jetstack-cert-manager-controller
tag: v0.8.1
# #
# Istio CNI plugin enabled # Istio CNI plugin enabled
...@@ -126,12 +135,24 @@ istio_cni: ...@@ -126,12 +135,24 @@ istio_cni:
# addon Istio CoreDNS configuration # addon Istio CoreDNS configuration
# #
istiocoredns: istiocoredns:
coreDNSImage: coredns-coredns image:
coreDNSPluginImage: istio-coredns-plugin repository: rancher/coredns-coredns
tag: 1.6.2
pluginImage:
repository: rancher/istio-coredns-plugin
tag: 0.2-istio-1.1
enabled: false enabled: false
# Common settings used among istio subcharts. # Common settings used among istio subcharts.
global: global:
# Specify rancher clusterId of external tracing config
# https://github.com/istio/istio.io/issues/4146#issuecomment-493543032
rancher:
clusterId:
systemDefaultRegistry: ""
# Default hub for Istio images. # Default hub for Istio images.
# Releases are published to docker hub under 'istio' project. # Releases are published to docker hub under 'istio' project.
# Dev builds from prow are on gcr.io # Dev builds from prow are on gcr.io
...@@ -146,6 +167,10 @@ global: ...@@ -146,6 +167,10 @@ global:
logging: logging:
level: "default:info" level: "default:info"
kubectl:
repository: rancher/istio-kubectl
tag: 1.4.3
# monitoring port used by mixer, pilot, galley and sidecar injector # monitoring port used by mixer, pilot, galley and sidecar injector
monitoringPort: 15014 monitoringPort: 15014
...@@ -162,6 +187,10 @@ global: ...@@ -162,6 +187,10 @@ global:
# will result in LDS rejection and the ingress will not work. # will result in LDS rejection and the ingress will not work.
enableHttps: false enableHttps: false
curl:
repository: rancher/pstauffer-curl
tag: v1.0.3
proxy: proxy:
# Configuration for the proxy init container # Configuration for the proxy init container
init: init:
...@@ -173,7 +202,8 @@ global: ...@@ -173,7 +202,8 @@ global:
cpu: 10m cpu: 10m
memory: 10Mi memory: 10Mi
# use fully qualified image names for alternate path to proxy. # use fully qualified image names for alternate path to proxy.
image: istio-proxyv2 repository: rancher/istio-proxyv2
tag: 1.4.3
# cluster domain. Default value is "cluster.local". # cluster domain. Default value is "cluster.local".
clusterDomain: "cluster.local" clusterDomain: "cluster.local"
...@@ -331,7 +361,8 @@ global: ...@@ -331,7 +361,8 @@ global:
proxy_init: proxy_init:
# Base name for the istio-init container, used to configure iptables. # Base name for the istio-init container, used to configure iptables.
image: istio-proxyv2 repository: rancher/istio-proxyv2
tag: 1.4.3
# imagePullPolicy is applied to istio control plane components. # imagePullPolicy is applied to istio control plane components.
# local tests require IfNotPresent, to avoid uploading to dockerhub. # local tests require IfNotPresent, to avoid uploading to dockerhub.
...@@ -557,6 +588,9 @@ global: ...@@ -557,6 +588,9 @@ global:
# defaultConfigVisibilitySettings: # defaultConfigVisibilitySettings:
#- '*' #- '*'
nodeagent:
repository: rancher/istio-node-agent-k8s
tag: 1.4.3
sds: sds:
# SDS enabled. IF set to true, mTLS certificates for the sidecars will be # SDS enabled. IF set to true, mTLS certificates for the sidecars will be
# distributed through the SecretDiscoveryService instead of using K8S secrets to mount the certificates. # distributed through the SecretDiscoveryService instead of using K8S secrets to mount the certificates.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment