Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make third party repo image names configurable #14815

Merged
merged 2 commits into from Jul 20, 2019
Merged

make third party repo image names configurable #14815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5186dd
move 3rd party images to values
anandkumarpatel Jun 18, 2019
f1322cb
Merge branch 'master' into fix/make-kubectl-image-a-param
anandkumarpatel Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions install/kubernetes/helm/istio/charts/certmanager/templates/deployment.yaml
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
app: certmanager
chart: {{ template "certmanager.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
release: {{ .Release.Name }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
Expand All @@ -35,7 +35,7 @@ spec:
{{- end }}
containers:
- name: certmanager
image: "{{ .Values.hub }}/cert-manager-controller:{{ .Values.tag }}"
image: "{{ .Values.hub }}/{{ .Values.image }}:{{ .Values.tag }}"
anandkumarpatel marked this conversation as resolved.
Show resolved Hide resolved
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args:
- --cluster-resource-namespace=$(POD_NAMESPACE)
Expand Down
1 change: 1 addition & 0 deletions install/kubernetes/helm/istio/charts/certmanager/values.yaml
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
enabled: false
replicaCount: 1
hub: quay.io/jetstack
image: cert-manager-controller
tag: v0.6.2
resources: {}
nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/kiali/templates/deployment.yaml
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ spec:
priorityClassName: "{{ .Values.global.priorityClassName }}"
{{- end }}
containers:
- image: "{{ .Values.hub }}/kiali:{{ .Values.tag }}"
- image: "{{ .Values.hub }}/{{ .Values.image }}:{{ .Values.tag }}"
anandkumarpatel marked this conversation as resolved.
Show resolved Hide resolved
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
name: kiali
command:
Expand Down
1 change: 1 addition & 0 deletions install/kubernetes/helm/istio/charts/kiali/values.yaml
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
enabled: false # Note that if using the demo or demo-auth yaml when installing via Helm, this default will be `true`.
replicaCount: 1
hub: quay.io/kiali
image: kiali
tag: v0.20
contextPath: /kiali # The root context path to access the Kiali UI.
nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/prometheus/templates/deployment.yaml
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ spec:
{{- end }}
containers:
- name: prometheus
image: "{{ .Values.hub }}/prometheus:{{ .Values.tag }}"
image: "{{ .Values.hub }}/{{ .Values.image }}:{{ .Values.tag }}"
anandkumarpatel marked this conversation as resolved.
Show resolved Hide resolved
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
args:
- '--storage.tsdb.retention={{ .Values.retention }}'
Expand Down
1 change: 1 addition & 0 deletions install/kubernetes/helm/istio/charts/prometheus/values.yaml
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
enabled: true
replicaCount: 1
hub: docker.io/prom
image: prometheus
tag: v2.8.0
retention: 6h
nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/tracing/templates/deployment-jaeger.yaml
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ spec:
{{- end }}
containers:
- name: jaeger
image: "{{ .Values.jaeger.hub }}/all-in-one:{{ .Values.jaeger.tag }}"
image: "{{ .Values.jaeger.hub }}/{{ .Values.jaeger.image }}:{{ .Values.jaeger.tag }}"
anandkumarpatel marked this conversation as resolved.
Show resolved Hide resolved
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports:
- containerPort: 9411
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/tracing/templates/deployment-zipkin.yaml
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ spec:
{{- end }}
containers:
- name: zipkin
image: "{{ .Values.zipkin.hub }}/zipkin:{{ .Values.zipkin.tag }}"
image: "{{ .Values.zipkin.hub }}/{{ .Values.zipkin.image }}:{{ .Values.zipkin.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports:
- containerPort: {{ .Values.zipkin.queryPort }}
Expand Down
2 changes: 2 additions & 0 deletions install/kubernetes/helm/istio/charts/tracing/values.yaml
View file
Open in desktop
Expand Up @@ -30,12 +30,14 @@ podAntiAffinityTermLabelSelector: []

jaeger:
hub: docker.io/jaegertracing
image: all-in-one
tag: 1.9
memory:
max_traces: 50000

zipkin:
hub: docker.io/openzipkin
image: zipkin
tag: 2.14.2
probeStartupDelay: 200
queryPort: 9411
Expand Down
16 changes: 8 additions & 8 deletions install/kubernetes/helm/istio/values.yaml
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@ kiali:
#
certmanager:
enabled: false

#
# Istio CNI plugin enabled
# This must be enabled to use the CNI plugin in Istio. The CNI plugin is installed separately.
Expand Down Expand Up @@ -250,7 +250,7 @@ global:
# available to scrape via the Envoy admin port at either /stats or /stats/prometheus.
#
# See https://www.envoyproxy.io/docs/envoy/latest/api-v2/config/metrics/v2/metrics_service.proto
# for details about Envoy's Metrics Service API.
# for details about Envoy's Metrics Service API.
#
# Disabled by default.
envoyMetricsService:
Expand Down Expand Up @@ -360,9 +360,9 @@ global:
# set of DNS settings than the normal application pods (e.g., in
# multicluster scenarios).
# NOTE: If using templates, follow the pattern in the commented example below.
#podDNSSearchNamespaces:
#- global
#- "[[ valueOrDefault .DeploymentMeta.Namespace \"default\" ]].global"
# podDNSSearchNamespaces:
# - global
# - "[[ valueOrDefault .DeploymentMeta.Namespace \"default\" ]].global"

# If set to true, the pilot and citadel mtls will be exposed on the
# ingress gateway
Expand Down Expand Up @@ -422,7 +422,7 @@ global:
# services or ServiceEntries for the destination port
# REGISTRY_ONLY - restrict outbound traffic to services defined in the service registry as well
# as those defined through ServiceEntries
# ALLOW_ANY is the default in 1.1. This means each pod will be able to make outbound requests
# ALLOW_ANY is the default in 1.1. This means each pod will be able to make outbound requests
# to services outside of the mesh without any ServiceEntry.
# REGISTRY_ONLY was the default in 1.0. If this behavior is desired, set the value below to REGISTRY_ONLY.
outboundTrafficPolicy:
Expand All @@ -437,8 +437,8 @@ global:
# rules should be exported to. Currently only one value can be provided in this list. This value
# should be one of the following two options:
# * implies these objects are visible to all namespaces, enabling any sidecar to talk to any other sidecar.
# . implies these objects are visible to only to sidecars in the same namespace, or if imported as a Sidecar.egress.host
#defaultConfigVisibilitySettings:
# . implies these objects are visible to only to sidecars in the same namespace, or if imported as a Sidecar.egress.host
# defaultConfigVisibilitySettings:
#- '*'

sds:
Expand Down