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

first change to apps/v1 for Install #13015

Merged
merged 3 commits into from
Apr 3, 2019
Merged

first change to apps/v1 for Install #13015

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bf671b
first change for install
irisdingbj Apr 3, 2019
cca4a76
appsv1
irisdingbj Apr 3, 2019
4e44616
indention
irisdingbj Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
first change for install
  • Loading branch information
@irisdingbj
irisdingbj committed Apr 3, 2019
commit 0bf671b80e98a3a7d69cae0cd55d44b27f714f42
7 changes: 6 additions & 1 deletion install/kubernetes/citadel_extras/istio-citadel-plugin-certs.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ metadata:
name: istio-citadel-service-account
namespace: {ISTIO_NAMESPACE}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-citadel
namespace: {ISTIO_NAMESPACE}
labels:
istio: citadel
spec:
replicas: 1
selector:
matchLabels:
istio: citadel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be careful of the indention here, although it's still working.

Copy link
Member Author

@irisdingbj irisdingbj Apr 3, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

template:
metadata:
labels:
Expand Down
7 changes: 6 additions & 1 deletion install/kubernetes/citadel_extras/istio-citadel-standalone.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,18 @@ metadata:
name: istio-citadel-service-account
namespace: {ISTIO_NAMESPACE}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-standalone-citadel
namespace: {ISTIO_NAMESPACE}
labels:
istio: standalone-citadel
spec:
replicas: 1
selector:
matchLabels:
istio: standalone-citadel
template:
metadata:
labels:
Expand Down
12 changes: 11 additions & 1 deletion install/kubernetes/citadel_extras/istio-citadel-with-health-check.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,23 @@ spec:
istio: citadel
---
# Citadel watching all namespaces
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-citadel
namespace: {ISTIO_NAMESPACE}
labels:
app: security
chart: security
heritage: Tiller
release: istio
istio: citadel
spec:
replicas: 1
selector:
matchLabels:
app: security
istio: citadel
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/galley/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-galley
Expand All @@ -11,6 +11,9 @@ metadata:
istio: galley
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
istio: galley
strategy:
rollingUpdate:
maxSurge: 1
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/gateways/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- range $key, $spec := .Values }}
{{- if ne $key "enabled" }}
{{- if $spec.enabled }}
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $key }}
Expand All @@ -21,6 +21,9 @@ spec:
replicas: 1
{{- end }}
{{- end }}
selector:
matchLabels:
{{ $key }}: {{ $val }}
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/grafana/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: grafana
Expand All @@ -10,6 +10,9 @@ metadata:
release: {{ .Release.Name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: grafana
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/istiocoredns/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istiocoredns
Expand All @@ -10,6 +10,9 @@ metadata:
release: {{ .Release.Name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: istiocoredns
template:
metadata:
name: istiocoredns
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/kiali/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: kiali
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/mixer/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
{{- range $key, $spec := .Values }}
{{- if or (eq $key "policy") (eq $key "telemetry") }}
{{- if $spec.enabled }}
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-{{ $key }}
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/nodeagent/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: istio-nodeagent
Expand All @@ -10,6 +10,9 @@ metadata:
heritage: {{ .Release.Service }}
istio: nodeagent
spec:
selector:
matchLabels:
istio: nodeagent
template:
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/pilot/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-pilot
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/charts/prometheus/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TODO: the original template has service account, roles, etc
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: prometheus
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/security/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# istio CA watching all namespaces
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-citadel
Expand All @@ -12,6 +12,9 @@ metadata:
istio: citadel
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
istio: citadel
strategy:
rollingUpdate:
maxSurge: 1
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/servicegraph/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: servicegraph
Expand All @@ -10,6 +10,9 @@ metadata:
release: {{ .Release.Name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: servicegraph
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/sidecarInjectorWebhook/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-sidecar-injector
Expand All @@ -11,6 +11,9 @@ metadata:
istio: sidecar-injector
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
istio: sidecar-injector
strategy:
rollingUpdate:
maxSurge: 1
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/tracing/templates/deployment-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{ if eq .Values.provider "jaeger" }}

apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-tracing
Expand All @@ -11,6 +11,9 @@ metadata:
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
selector:
matchLabels:
app: jaeger
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/helm/istio/charts/tracing/templates/deployment-zipkin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{ if eq .Values.provider "zipkin" }}

apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: istio-tracing
Expand All @@ -11,6 +11,9 @@ metadata:
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
selector:
matchLabels:
app: zipkin
template:
metadata:
labels:
Expand Down