Skip to content

K
k3s
Unverified Commit 77db0fb3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #62813 from ostromart/automated-cherry-pick-of-#61911-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61911 upstream release 1.10 **What this PR does / why we need it:** PR addresses two issues: 1. Update Istio addon version to latest stable 0.6.0 (required for e2e test integration). 2. Mirror images in gcr.io for security scanning, since this is an addon. Fixes #61910 **Release note**: ```release-note Update version of Istio addon from 0.5.1 to 0.6.0. ```
parents 9e4010d0 754d2ca0
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 66 deletions
cluster/addons/istio/auth/istio-auth.yaml
View file @ 77db0fb3
# GENERATED FILE. Use with Kubernetes 1.7+ # GENERATED FILE. Use with Kubernetes 1.7+
# TO UPDATE, modify files in install/kubernetes/templates and run install/updateVersion.sh # TO UPDATE, modify files in install/kubernetes/templates and run install/updateVersion.sh
#
# Required for Istio as k8s addon.
apiVersion: v1
kind: Namespace
metadata:
name: default
labels:
istio-injection: enabled
addonmanager.kubernetes.io/mode: Reconcile
--
################################ ################################
# Istio system namespace # Istio system namespace
################################ ################################
...@@ -290,7 +300,7 @@ spec: ...@@ -290,7 +300,7 @@ spec:
serviceAccountName: istio-mixer-service-account serviceAccountName: istio-mixer-service-account
containers: containers:
- name: statsd-to-prometheus - name: statsd-to-prometheus
image: prom/statsd-exporter:v0.5.0 image: gcr.io/istio-release/statsd-exporter:v0.5.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9102 - containerPort: 9102
...@@ -302,7 +312,7 @@ spec: ...@@ -302,7 +312,7 @@ spec:
- name: config-volume - name: config-volume
mountPath: /etc/statsd mountPath: /etc/statsd
- name: mixer - name: mixer
image: gcr.io/istio-release/mixer:0.5.1 image: gcr.io/istio-release/mixer:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9091 - containerPort: 9091
...@@ -317,7 +327,7 @@ spec: ...@@ -317,7 +327,7 @@ spec:
- -v - -v
- "2" - "2"
- name: istio-proxy - name: istio-proxy
image: gcr.io/istio-release/proxy:0.5.1 image: gcr.io/istio-release/proxy:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 15004 - containerPort: 15004
...@@ -596,6 +606,25 @@ spec: ...@@ -596,6 +606,25 @@ spec:
kind: CustomResourceDefinition kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
metadata: metadata:
name: solarwindses.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
package: solarwinds
istio: mixer-adapter
spec:
group: config.istio.io
names:
kind: solarwinds
plural: solarwindses
singular: solarwinds
scope: Namespaced
version: v1alpha2
---
kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1
metadata:
name: stackdrivers.config.istio.io name: stackdrivers.config.istio.io
labels: labels:
k8s-app: istio k8s-app: istio
...@@ -653,7 +682,7 @@ spec: ...@@ -653,7 +682,7 @@ spec:
kind: CustomResourceDefinition kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
metadata: metadata:
name: apikeies.config.istio.io name: apikeys.config.istio.io
labels: labels:
k8s-app: istio k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
...@@ -663,7 +692,7 @@ spec: ...@@ -663,7 +692,7 @@ spec:
group: config.istio.io group: config.istio.io
names: names:
kind: apikey kind: apikey
plural: apikeies plural: apikeys
singular: apikey singular: apikey
scope: Namespaced scope: Namespaced
version: v1alpha2 version: v1alpha2
...@@ -1339,16 +1368,16 @@ spec: ...@@ -1339,16 +1368,16 @@ spec:
attribute_bindings: attribute_bindings:
# Fill the new attributes from the adapter produced output. # Fill the new attributes from the adapter produced output.
# $out refers to an instance of OutputTemplate message # $out refers to an instance of OutputTemplate message
source.ip: $out.source_pod_ip source.ip: $out.source_pod_ip | ip("0.0.0.0")
source.labels: $out.source_labels source.labels: $out.source_labels | emptyStringMap()
source.namespace: $out.source_namespace source.namespace: $out.source_namespace | "default"
source.service: $out.source_service source.service: $out.source_service | "unknown"
source.serviceAccount: $out.source_service_account_name source.serviceAccount: $out.source_service_account_name | "unknown"
destination.ip: $out.destination_pod_ip destination.ip: $out.destination_pod_ip | ip("0.0.0.0")
destination.labels: $out.destination_labels destination.labels: $out.destination_labels | emptyStringMap()
destination.namespace: $out.destination_namespace destination.namespace: $out.destination_namespace | "default"
destination.service: $out.destination_service destination.service: $out.destination_service | "unknown"
destination.serviceAccount: $out.destination_service_account_name destination.serviceAccount: $out.destination_service_account_name | "unknown"
--- ---
################################ ################################
# Istio configMap cluster-wide # Istio configMap cluster-wide
...@@ -1378,8 +1407,9 @@ data: ...@@ -1378,8 +1407,9 @@ data:
enableTracing: true enableTracing: true
# #
# To disable the mixer completely (including metrics), comment out # To disable the mixer completely (including metrics), comment out
# the following line # the following lines
mixerAddress: istio-mixer.istio-system:15004 mixerCheckServer: istio-mixer.istio-system:15004
mixerReportServer: istio-mixer.istio-system:15004
# This is the ingress service name, update if you used a different name # This is the ingress service name, update if you used a different name
ingressService: istio-ingress ingressService: istio-ingress
# #
...@@ -1486,6 +1516,57 @@ spec: ...@@ -1486,6 +1516,57 @@ spec:
scope: Namespaced scope: Namespaced
version: v1alpha2 version: v1alpha2
--- ---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: v1alpha2routerules.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: config.istio.io
names:
kind: V1alpha2RouteRule
listKind: V1alpha2RouteRuleList
plural: v1alpha2routerules
singular: v1alpha2routerule
scope: Namespaced
version: v1alpha2
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: destinationrules.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: config.istio.io
names:
kind: DestinationRule
listKind: DestinationRuleList
plural: destinationrules
singular: destinationrule
scope: Namespaced
version: v1alpha2
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: externalservices.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: config.istio.io
names:
kind: ExternalService
listKind: ExternalServiceList
plural: externalservices
singular: externalservice
scope: Namespaced
version: v1alpha2
---
# Pilot service for discovery # Pilot service for discovery
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
...@@ -1538,7 +1619,7 @@ spec: ...@@ -1538,7 +1619,7 @@ spec:
serviceAccountName: istio-pilot-service-account serviceAccountName: istio-pilot-service-account
containers: containers:
- name: discovery - name: discovery
image: gcr.io/istio-release/pilot:0.5.1 image: gcr.io/istio-release/pilot:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: ["discovery", "-v", "2", "--admission-service", "istio-pilot"] args: ["discovery", "-v", "2", "--admission-service", "istio-pilot"]
ports: ports:
...@@ -1555,11 +1636,13 @@ spec: ...@@ -1555,11 +1636,13 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: PILOT_THROTTLE
value: "200"
volumeMounts: volumeMounts:
- name: config-volume - name: config-volume
mountPath: /etc/istio/config mountPath: /etc/istio/config
- name: istio-proxy - name: istio-proxy
image: gcr.io/istio-release/proxy:0.5.1 image: gcr.io/istio-release/proxy:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 15003 - containerPort: 15003
...@@ -1639,7 +1722,7 @@ spec: ...@@ -1639,7 +1722,7 @@ spec:
serviceAccountName: istio-ingress-service-account serviceAccountName: istio-ingress-service-account
containers: containers:
- name: istio-ingress - name: istio-ingress
image: gcr.io/istio-release/proxy:0.5.1 image: gcr.io/istio-release/proxy:0.6.0
args: args:
- proxy - proxy
- ingress - ingress
...@@ -1731,7 +1814,7 @@ spec: ...@@ -1731,7 +1814,7 @@ spec:
serviceAccountName: istio-ca-service-account serviceAccountName: istio-ca-service-account
containers: containers:
- name: istio-ca - name: istio-ca
image: gcr.io/istio-release/istio-ca:0.5.1 image: gcr.io/istio-release/istio-ca:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["/usr/local/bin/istio_ca"] command: ["/usr/local/bin/istio_ca"]
args: args:
...@@ -1776,21 +1859,16 @@ spec: ...@@ -1776,21 +1859,16 @@ spec:
annotations: annotations:
sidecar.istio.io/inject: "false" sidecar.istio.io/inject: "false"
spec: spec:
serviceAccountName: grafana
containers: containers:
- name: grafana - name: grafana
image: gcr.io/istio-release/grafana:0.5.1 image: gcr.io/istio-release/grafana:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 3000 - containerPort: 3000
env: env:
- name: GRAFANA_PORT # Only put environment related config here. Generic Istio config
value: "3000" # should go in addons/grafana/grafana.ini.
- name: GF_AUTH_BASIC_ENABLED
value: "false"
- name: GF_AUTH_ANONYMOUS_ENABLED
value: "true"
- name: GF_AUTH_ANONYMOUS_ORG_ROLE
value: Admin
- name: GF_PATHS_DATA - name: GF_PATHS_DATA
value: /data/grafana value: /data/grafana
volumeMounts: volumeMounts:
...@@ -1800,6 +1878,15 @@ spec: ...@@ -1800,6 +1878,15 @@ spec:
- name: grafana-data - name: grafana-data
emptyDir: {} emptyDir: {}
--- ---
apiVersion: v1
kind: ServiceAccount
metadata:
name: grafana
namespace: istio-system
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
---
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
...@@ -2032,7 +2119,7 @@ spec: ...@@ -2032,7 +2119,7 @@ spec:
serviceAccountName: prometheus serviceAccountName: prometheus
containers: containers:
- name: prometheus - name: prometheus
image: docker.io/prom/prometheus:v2.0.0 image: gcr.io/istio-release/prom/prometheus:v2.0.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- '--storage.tsdb.retention=6h' - '--storage.tsdb.retention=6h'
...@@ -2071,6 +2158,7 @@ rules: ...@@ -2071,6 +2158,7 @@ rules:
- services - services
- endpoints - endpoints
- pods - pods
- nodes/proxy
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: resources:
...@@ -2114,7 +2202,7 @@ spec: ...@@ -2114,7 +2202,7 @@ spec:
spec: spec:
containers: containers:
- name: servicegraph - name: servicegraph
image: gcr.io/istio-release/servicegraph:0.5.1 image: gcr.io/istio-release/servicegraph:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 8088 - containerPort: 8088
...@@ -2156,7 +2244,7 @@ spec: ...@@ -2156,7 +2244,7 @@ spec:
spec: spec:
containers: containers:
- name: zipkin - name: zipkin
image: docker.io/openzipkin/zipkin:latest image: gcr.io/istio-release/zipkin:2.5.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9411 - containerPort: 9411
......
cluster/addons/istio/noauth/istio.yaml
View file @ 77db0fb3
# GENERATED FILE. Use with Kubernetes 1.7+ # GENERATED FILE. Use with Kubernetes 1.7+
# TO UPDATE, modify files in install/kubernetes/templates and run install/updateVersion.sh # TO UPDATE, modify files in install/kubernetes/templates and run install/updateVersion.sh
#
# Required for Istio as k8s addon.
apiVersion: v1
kind: Namespace
metadata:
name: default
labels:
istio-injection: enabled
addonmanager.kubernetes.io/mode: Reconcile
---
################################ ################################
# Istio system namespace # Istio system namespace
################################ ################################
...@@ -290,7 +300,7 @@ spec: ...@@ -290,7 +300,7 @@ spec:
serviceAccountName: istio-mixer-service-account serviceAccountName: istio-mixer-service-account
containers: containers:
- name: statsd-to-prometheus - name: statsd-to-prometheus
image: prom/statsd-exporter:v0.5.0 image: gcr.io/istio-release/statsd-exporter:v0.5.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9102 - containerPort: 9102
...@@ -302,7 +312,7 @@ spec: ...@@ -302,7 +312,7 @@ spec:
- name: config-volume - name: config-volume
mountPath: /etc/statsd mountPath: /etc/statsd
- name: mixer - name: mixer
image: gcr.io/istio-release/mixer:0.5.1 image: gcr.io/istio-release/mixer:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9091 - containerPort: 9091
...@@ -317,7 +327,7 @@ spec: ...@@ -317,7 +327,7 @@ spec:
- -v - -v
- "2" - "2"
- name: istio-proxy - name: istio-proxy
image: gcr.io/istio-release/proxy:0.5.1 image: gcr.io/istio-release/proxy:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 15004 - containerPort: 15004
...@@ -596,6 +606,25 @@ spec: ...@@ -596,6 +606,25 @@ spec:
kind: CustomResourceDefinition kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
metadata: metadata:
name: solarwindses.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
package: solarwinds
istio: mixer-adapter
spec:
group: config.istio.io
names:
kind: solarwinds
plural: solarwindses
singular: solarwinds
scope: Namespaced
version: v1alpha2
---
kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1
metadata:
name: stackdrivers.config.istio.io name: stackdrivers.config.istio.io
labels: labels:
k8s-app: istio k8s-app: istio
...@@ -653,7 +682,7 @@ spec: ...@@ -653,7 +682,7 @@ spec:
kind: CustomResourceDefinition kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
metadata: metadata:
name: apikeies.config.istio.io name: apikeys.config.istio.io
labels: labels:
k8s-app: istio k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
...@@ -663,7 +692,7 @@ spec: ...@@ -663,7 +692,7 @@ spec:
group: config.istio.io group: config.istio.io
names: names:
kind: apikey kind: apikey
plural: apikeies plural: apikeys
singular: apikey singular: apikey
scope: Namespaced scope: Namespaced
version: v1alpha2 version: v1alpha2
...@@ -1339,16 +1368,16 @@ spec: ...@@ -1339,16 +1368,16 @@ spec:
attribute_bindings: attribute_bindings:
# Fill the new attributes from the adapter produced output. # Fill the new attributes from the adapter produced output.
# $out refers to an instance of OutputTemplate message # $out refers to an instance of OutputTemplate message
source.ip: $out.source_pod_ip source.ip: $out.source_pod_ip | ip("0.0.0.0")
source.labels: $out.source_labels source.labels: $out.source_labels | emptyStringMap()
source.namespace: $out.source_namespace source.namespace: $out.source_namespace | "default"
source.service: $out.source_service source.service: $out.source_service | "unknown"
source.serviceAccount: $out.source_service_account_name source.serviceAccount: $out.source_service_account_name | "unknown"
destination.ip: $out.destination_pod_ip destination.ip: $out.destination_pod_ip | ip("0.0.0.0")
destination.labels: $out.destination_labels destination.labels: $out.destination_labels | emptyStringMap()
destination.namespace: $out.destination_namespace destination.namespace: $out.destination_namespace | "default"
destination.service: $out.destination_service destination.service: $out.destination_service | "unknown"
destination.serviceAccount: $out.destination_service_account_name destination.serviceAccount: $out.destination_service_account_name | "unknown"
--- ---
################################ ################################
# Istio configMap cluster-wide # Istio configMap cluster-wide
...@@ -1378,8 +1407,9 @@ data: ...@@ -1378,8 +1407,9 @@ data:
enableTracing: true enableTracing: true
# #
# To disable the mixer completely (including metrics), comment out # To disable the mixer completely (including metrics), comment out
# the following line # the following lines
mixerAddress: istio-mixer.istio-system:15004 mixerCheckServer: istio-mixer.istio-system:15004
mixerReportServer: istio-mixer.istio-system:15004
# This is the ingress service name, update if you used a different name # This is the ingress service name, update if you used a different name
ingressService: istio-ingress ingressService: istio-ingress
# #
...@@ -1486,6 +1516,57 @@ spec: ...@@ -1486,6 +1516,57 @@ spec:
scope: Namespaced scope: Namespaced
version: v1alpha2 version: v1alpha2
--- ---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: v1alpha2routerules.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: config.istio.io
names:
kind: V1alpha2RouteRule
listKind: V1alpha2RouteRuleList
plural: v1alpha2routerules
singular: v1alpha2routerule
scope: Namespaced
version: v1alpha2
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: destinationrules.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: config.istio.io
names:
kind: DestinationRule
listKind: DestinationRuleList
plural: destinationrules
singular: destinationrule
scope: Namespaced
version: v1alpha2
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: externalservices.config.istio.io
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: config.istio.io
names:
kind: ExternalService
listKind: ExternalServiceList
plural: externalservices
singular: externalservice
scope: Namespaced
version: v1alpha2
---
# Pilot service for discovery # Pilot service for discovery
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
...@@ -1538,7 +1619,7 @@ spec: ...@@ -1538,7 +1619,7 @@ spec:
serviceAccountName: istio-pilot-service-account serviceAccountName: istio-pilot-service-account
containers: containers:
- name: discovery - name: discovery
image: gcr.io/istio-release/pilot:0.5.1 image: gcr.io/istio-release/pilot:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: ["discovery", "-v", "2", "--admission-service", "istio-pilot"] args: ["discovery", "-v", "2", "--admission-service", "istio-pilot"]
ports: ports:
...@@ -1555,11 +1636,13 @@ spec: ...@@ -1555,11 +1636,13 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: PILOT_THROTTLE
value: "200"
volumeMounts: volumeMounts:
- name: config-volume - name: config-volume
mountPath: /etc/istio/config mountPath: /etc/istio/config
- name: istio-proxy - name: istio-proxy
image: gcr.io/istio-release/proxy:0.5.1 image: gcr.io/istio-release/proxy:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 15003 - containerPort: 15003
...@@ -1639,7 +1722,7 @@ spec: ...@@ -1639,7 +1722,7 @@ spec:
serviceAccountName: istio-ingress-service-account serviceAccountName: istio-ingress-service-account
containers: containers:
- name: istio-ingress - name: istio-ingress
image: gcr.io/istio-release/proxy:0.5.1 image: gcr.io/istio-release/proxy:0.6.0
args: args:
- proxy - proxy
- ingress - ingress
...@@ -1731,7 +1814,7 @@ spec: ...@@ -1731,7 +1814,7 @@ spec:
serviceAccountName: istio-ca-service-account serviceAccountName: istio-ca-service-account
containers: containers:
- name: istio-ca - name: istio-ca
image: gcr.io/istio-release/istio-ca:0.5.1 image: gcr.io/istio-release/istio-ca:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["/usr/local/bin/istio_ca"] command: ["/usr/local/bin/istio_ca"]
args: args:
...@@ -1776,21 +1859,16 @@ spec: ...@@ -1776,21 +1859,16 @@ spec:
annotations: annotations:
sidecar.istio.io/inject: "false" sidecar.istio.io/inject: "false"
spec: spec:
serviceAccountName: grafana
containers: containers:
- name: grafana - name: grafana
image: gcr.io/istio-release/grafana:0.5.1 image: gcr.io/istio-release/grafana:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 3000 - containerPort: 3000
env: env:
- name: GRAFANA_PORT # Only put environment related config here. Generic Istio config
value: "3000" # should go in addons/grafana/grafana.ini.
- name: GF_AUTH_BASIC_ENABLED
value: "false"
- name: GF_AUTH_ANONYMOUS_ENABLED
value: "true"
- name: GF_AUTH_ANONYMOUS_ORG_ROLE
value: Admin
- name: GF_PATHS_DATA - name: GF_PATHS_DATA
value: /data/grafana value: /data/grafana
volumeMounts: volumeMounts:
...@@ -1800,6 +1878,15 @@ spec: ...@@ -1800,6 +1878,15 @@ spec:
- name: grafana-data - name: grafana-data
emptyDir: {} emptyDir: {}
--- ---
apiVersion: v1
kind: ServiceAccount
metadata:
name: grafana
namespace: istio-system
labels:
k8s-app: istio
addonmanager.kubernetes.io/mode: Reconcile
---
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
...@@ -2032,7 +2119,7 @@ spec: ...@@ -2032,7 +2119,7 @@ spec:
serviceAccountName: prometheus serviceAccountName: prometheus
containers: containers:
- name: prometheus - name: prometheus
image: docker.io/prom/prometheus:v2.0.0 image: gcr.io/istio-release/prom/prometheus:v2.0.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- '--storage.tsdb.retention=6h' - '--storage.tsdb.retention=6h'
...@@ -2071,6 +2158,7 @@ rules: ...@@ -2071,6 +2158,7 @@ rules:
- services - services
- endpoints - endpoints
- pods - pods
- nodes/proxy
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: resources:
...@@ -2114,7 +2202,7 @@ spec: ...@@ -2114,7 +2202,7 @@ spec:
spec: spec:
containers: containers:
- name: servicegraph - name: servicegraph
image: gcr.io/istio-release/servicegraph:0.5.1 image: gcr.io/istio-release/servicegraph:0.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 8088 - containerPort: 8088
...@@ -2156,7 +2244,7 @@ spec: ...@@ -2156,7 +2244,7 @@ spec:
spec: spec:
containers: containers:
- name: zipkin - name: zipkin
image: docker.io/openzipkin/zipkin:latest image: gcr.io/istio-release/zipkin:2.5.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9411 - containerPort: 9411
......
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