Skip to content

Add PILOT_ENABLED_SERVICE_APIS to manifest #620

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

Closed
wants to merge 6 commits into from
+300 −340
Closed

Add PILOT_ENABLED_SERVICE_APIS to manifest #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3890f0d
Add PILOT_ENABLED_SERVICE_APIS to manifest
nak3 May 11, 2021
cecb31e
Run generate-manifests.sh
nak3 May 11, 2021
091ae6a
Run hack/update-codegen.sh
nak3 May 11, 2021
1b49fc5
Fix order
nak3 May 11, 2021
0ff9358
Change order
nak3 May 16, 2021
6aa71d6
change order
nak3 May 16, 2021
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
2 changes: 2 additions & 0 deletions third_party/istio-head/istio-ci-mesh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ spec:
autoscaleMax: 10
cpu:
targetAverageUtilization: 60
env:
PILOT_ENABLED_SERVICE_APIS: true
Copy link
Contributor

Choose a reason for hiding this comment

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

this is default in latest istio fwiw

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, thank you! Istio v1.10+ enabled it by default.Then, we should update to 1.10 by #631 first then add this option in 1.9 only.

gateways:
istio-ingressgateway:
autoscaleEnabled: false
Expand Down
42 changes: 11 additions & 31 deletions third_party/istio-head/istio-ci-mesh/istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6225,7 +6225,7 @@ data:
"sts": {
"servicePort": 0
},
"tag": "1.11-alpha.f177e200f0e78b4be3e1ead48b7d8ac2951d92e0",
"tag": "1.11-alpha.b18a9b08f9fda5463c2bd33afa44130dfd222f58",
"tracer": {
"datadog": {
"address": "$(HOST_IP):8126"
Expand Down Expand Up @@ -6417,7 +6417,7 @@ data:
{{- end }}
restartPolicy: Always
{{ end -}}
{{- if eq .Values.global.proxy.enableCoreDump true }}
{{- if eq (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }}
- name: enable-core-dump
args:
- -c
Expand Down Expand Up @@ -6460,12 +6460,6 @@ data:
- sidecar
- --domain
- $(POD_NAMESPACE).svc.{{ .Values.global.proxy.clusterDomain }}
- --serviceCluster
{{ if ne "" (index .ObjectMeta.Labels "app") -}}
- "{{ index .ObjectMeta.Labels `app` }}.$(POD_NAMESPACE)"
{{ else -}}
- "{{ valueOrDefault .DeploymentMeta.Name `istio-proxy` }}.{{ valueOrDefault .DeploymentMeta.Namespace `default` }}"
{{ end -}}
- --proxyLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/logLevel` .Values.global.proxy.logLevel }}
- --proxyComponentLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/componentLogLevel` .Values.global.proxy.componentLogLevel }}
- --log_output_level={{ annotation .ObjectMeta `sidecar.istio.io/agentLogLevel` .Values.global.logging.level }}
Expand Down Expand Up @@ -6525,14 +6519,6 @@ data:
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: CANONICAL_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['service.istio.io/canonical-name']
- name: CANONICAL_REVISION
valueFrom:
fieldRef:
fieldPath: metadata.labels['service.istio.io/canonical-revision']
- name: PROXY_CONFIG
value: |
{{ protoToJSON .ProxyConfig }}
Expand All @@ -6559,11 +6545,6 @@ data:
- name: ISTIO_META_NETWORK
value: "{{ .Values.global.network }}"
{{- end }}
{{ if .ObjectMeta.Annotations }}
- name: ISTIO_METAJSON_ANNOTATIONS
value: |
{{ toJSON .ObjectMeta.Annotations }}
{{ end }}
{{- if .DeploymentMeta.Name }}
- name: ISTIO_META_WORKLOAD_NAME
value: "{{ .DeploymentMeta.Name }}"
Expand Down Expand Up @@ -6623,7 +6604,7 @@ data:
drop:
- ALL
privileged: {{ .Values.global.proxy.privileged }}
readOnlyRootFilesystem: {{ not .Values.global.proxy.enableCoreDump }}
readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }}
runAsGroup: 1337
fsGroup: 1337
{{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}}
Expand Down Expand Up @@ -6888,11 +6869,6 @@ data:
- name: ISTIO_META_NETWORK
value: "{{ .Values.global.network }}"
{{- end }}
{{ if .ObjectMeta.Annotations }}
- name: ISTIO_METAJSON_ANNOTATIONS
value: |
{{ toJSON .ObjectMeta.Annotations }}
{{ end }}
{{- if .DeploymentMeta.Name }}
- name: ISTIO_META_WORKLOAD_NAME
value: "{{ .DeploymentMeta.Name }}"
Expand Down Expand Up @@ -7155,7 +7131,7 @@ spec:
value: "20"
- name: ISTIO_META_CLUSTER_ID
value: Kubernetes
image: gcr.io/istio-testing/proxyv2:1.11-alpha.f177e200f0e78b4be3e1ead48b7d8ac2951d92e0
image: gcr.io/istio-testing/proxyv2:1.11-alpha.b18a9b08f9fda5463c2bd33afa44130dfd222f58
name: istio-proxy
ports:
- containerPort: 15021
Expand Down Expand Up @@ -7331,6 +7307,8 @@ spec:
fieldPath: spec.serviceAccountName
- name: KUBECONFIG
value: /var/run/secrets/remote/config
- name: PILOT_ENABLED_SERVICE_APIS
value: "true"
- name: PILOT_ENABLE_STATUS
value: "true"
- name: PILOT_TRACE_SAMPLING
Expand All @@ -7345,9 +7323,7 @@ spec:
value: "true"
- name: CLUSTER_ID
value: Kubernetes
- name: EXTERNAL_ISTIOD
value: "false"
image: gcr.io/istio-testing/pilot:1.11-alpha.f177e200f0e78b4be3e1ead48b7d8ac2951d92e0
image: gcr.io/istio-testing/pilot:1.11-alpha.b18a9b08f9fda5463c2bd33afa44130dfd222f58
name: discovery
ports:
- containerPort: 8080
Expand Down Expand Up @@ -7551,6 +7527,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down Expand Up @@ -7586,6 +7563,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down Expand Up @@ -7623,6 +7601,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down Expand Up @@ -7656,6 +7635,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down
2 changes: 2 additions & 0 deletions third_party/istio-head/istio-ci-no-mesh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ spec:
autoscaleMax: 10
cpu:
targetAverageUtilization: 60
env:
PILOT_ENABLED_SERVICE_APIS: true
gateways:
istio-ingressgateway:
autoscaleEnabled: false
Expand Down
42 changes: 11 additions & 31 deletions third_party/istio-head/istio-ci-no-mesh/istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6224,7 +6224,7 @@ data:
"sts": {
"servicePort": 0
},
"tag": "1.11-alpha.f177e200f0e78b4be3e1ead48b7d8ac2951d92e0",
"tag": "1.11-alpha.b18a9b08f9fda5463c2bd33afa44130dfd222f58",
"tracer": {
"datadog": {
"address": "$(HOST_IP):8126"
Expand Down Expand Up @@ -6416,7 +6416,7 @@ data:
{{- end }}
restartPolicy: Always
{{ end -}}
{{- if eq .Values.global.proxy.enableCoreDump true }}
{{- if eq (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }}
- name: enable-core-dump
args:
- -c
Expand Down Expand Up @@ -6459,12 +6459,6 @@ data:
- sidecar
- --domain
- $(POD_NAMESPACE).svc.{{ .Values.global.proxy.clusterDomain }}
- --serviceCluster
{{ if ne "" (index .ObjectMeta.Labels "app") -}}
- "{{ index .ObjectMeta.Labels `app` }}.$(POD_NAMESPACE)"
{{ else -}}
- "{{ valueOrDefault .DeploymentMeta.Name `istio-proxy` }}.{{ valueOrDefault .DeploymentMeta.Namespace `default` }}"
{{ end -}}
- --proxyLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/logLevel` .Values.global.proxy.logLevel }}
- --proxyComponentLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/componentLogLevel` .Values.global.proxy.componentLogLevel }}
- --log_output_level={{ annotation .ObjectMeta `sidecar.istio.io/agentLogLevel` .Values.global.logging.level }}
Expand Down Expand Up @@ -6524,14 +6518,6 @@ data:
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: CANONICAL_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['service.istio.io/canonical-name']
- name: CANONICAL_REVISION
valueFrom:
fieldRef:
fieldPath: metadata.labels['service.istio.io/canonical-revision']
- name: PROXY_CONFIG
value: |
{{ protoToJSON .ProxyConfig }}
Expand All @@ -6558,11 +6544,6 @@ data:
- name: ISTIO_META_NETWORK
value: "{{ .Values.global.network }}"
{{- end }}
{{ if .ObjectMeta.Annotations }}
- name: ISTIO_METAJSON_ANNOTATIONS
value: |
{{ toJSON .ObjectMeta.Annotations }}
{{ end }}
{{- if .DeploymentMeta.Name }}
- name: ISTIO_META_WORKLOAD_NAME
value: "{{ .DeploymentMeta.Name }}"
Expand Down Expand Up @@ -6622,7 +6603,7 @@ data:
drop:
- ALL
privileged: {{ .Values.global.proxy.privileged }}
readOnlyRootFilesystem: {{ not .Values.global.proxy.enableCoreDump }}
readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }}
runAsGroup: 1337
fsGroup: 1337
{{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}}
Expand Down Expand Up @@ -6887,11 +6868,6 @@ data:
- name: ISTIO_META_NETWORK
value: "{{ .Values.global.network }}"
{{- end }}
{{ if .ObjectMeta.Annotations }}
- name: ISTIO_METAJSON_ANNOTATIONS
value: |
{{ toJSON .ObjectMeta.Annotations }}
{{ end }}
{{- if .DeploymentMeta.Name }}
- name: ISTIO_META_WORKLOAD_NAME
value: "{{ .DeploymentMeta.Name }}"
Expand Down Expand Up @@ -7154,7 +7130,7 @@ spec:
value: standard
- name: ISTIO_META_CLUSTER_ID
value: Kubernetes
image: gcr.io/istio-testing/proxyv2:1.11-alpha.f177e200f0e78b4be3e1ead48b7d8ac2951d92e0
image: gcr.io/istio-testing/proxyv2:1.11-alpha.b18a9b08f9fda5463c2bd33afa44130dfd222f58
name: istio-proxy
ports:
- containerPort: 15021
Expand Down Expand Up @@ -7330,6 +7306,8 @@ spec:
fieldPath: spec.serviceAccountName
- name: KUBECONFIG
value: /var/run/secrets/remote/config
- name: PILOT_ENABLED_SERVICE_APIS
value: "true"
- name: PILOT_ENABLE_STATUS
value: "true"
- name: PILOT_TRACE_SAMPLING
Expand All @@ -7344,9 +7322,7 @@ spec:
value: "true"
- name: CLUSTER_ID
value: Kubernetes
- name: EXTERNAL_ISTIOD
value: "false"
image: gcr.io/istio-testing/pilot:1.11-alpha.f177e200f0e78b4be3e1ead48b7d8ac2951d92e0
image: gcr.io/istio-testing/pilot:1.11-alpha.b18a9b08f9fda5463c2bd33afa44130dfd222f58
name: discovery
ports:
- containerPort: 8080
Expand Down Expand Up @@ -7550,6 +7526,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down Expand Up @@ -7585,6 +7562,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down Expand Up @@ -7622,6 +7600,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down Expand Up @@ -7655,6 +7634,7 @@ webhooks:
name: istiod
namespace: istio-system
path: /inject
port: 443
caBundle: ""
sideEffects: None
rules:
Expand Down
2 changes: 2 additions & 0 deletions third_party/istio-head/istio-kind-mesh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spec:
autoscaleMax: 3
cpu:
targetAverageUtilization: 60
env:
PILOT_ENABLED_SERVICE_APIS: true
gateways:
istio-ingressgateway:
autoscaleEnabled: false
Expand Down
Loading