From 6f0668fc4af48dbdaad6a7914118e30d02a2021d Mon Sep 17 00:00:00 2001 From: Yuan Gong Date: Fri, 17 Jan 2020 16:05:11 +0800 Subject: [PATCH 1/3] Add istio sidecar inject false to deployments --- admission-webhook/webhook/base/deployment.yaml | 5 ++++- aws/aws-alb-ingress-controller/base/deployment.yaml | 4 +++- cert-manager/cert-manager/base/deployment.yaml | 3 +++ common/basic-auth/base/gatekeeper-deployment.yaml | 2 ++ common/basic-auth/base/kflogin-deployment.yaml | 2 ++ common/centraldashboard/base/deployment.yaml | 2 ++ common/spartakus/base/deployment.yaml | 2 ++ gcp/cloud-endpoints/base/deployment.yaml | 2 ++ jupyter/jupyter-web-app/base/deployment.yaml | 3 +++ jupyter/notebook-controller/base/deployment.yaml | 3 +++ .../base/katib-controller-deployment.yaml | 2 ++ katib/katib-controller/base/katib-db-deployment.yaml | 2 ++ .../base/katib-manager-deployment.yaml | 2 ++ katib/katib-controller/base/katib-ui-deployment.yaml | 2 ++ kubebench/base/deployment.yaml | 2 ++ modeldb/base/artifact-store-deployment.yaml | 2 ++ modeldb/base/backend-deployment.yaml | 2 ++ modeldb/base/mysql-backend-deployment.yaml | 2 ++ modeldb/base/proxy-deployment.yaml | 2 ++ modeldb/base/webapp-deplyment.yaml | 2 ++ mpi-job/mpi-operator/base/deployment.yaml | 2 ++ mxnet-job/mxnet-operator/base/deployment.yaml | 2 ++ pipeline/api-service/base/deployment.yaml | 9 ++++++--- pipeline/minio/base/deployment.yaml | 3 +++ pipeline/mysql/base/deployment.yaml | 3 +++ pipeline/persistent-agent/base/deployment.yaml | 3 +++ .../base/deployment.yaml | 2 ++ pipeline/pipelines-ui/base/deployment.yaml | 2 ++ pipeline/pipelines-ui/overlays/gcp/deployment.yaml | 3 +++ pipeline/pipelines-viewer/base/deployment.yaml | 3 +++ pipeline/scheduledworkflow/base/deployment.yaml | 3 +++ profiles/base/deployment.yaml | 3 +++ pytorch-job/pytorch-operator/base/deployment.yaml | 2 ++ spark/spark-operator/base/deploy.yaml | 1 + tektoncd/tektoncd-dashboard/base/deployment.yaml | 2 ++ tektoncd/tektoncd-install/base/deployment.yaml | 2 ++ tensorboard/base/deployment.yaml | 2 ++ tests/admission-webhook-webhook-base_test.go | 5 ++++- ...ission-webhook-webhook-overlays-application_test.go | 5 ++++- ...ssion-webhook-webhook-overlays-cert-manager_test.go | 5 ++++- tests/aws-aws-alb-ingress-controller-base_test.go | 5 ++++- ...alb-ingress-controller-overlays-application_test.go | 5 ++++- ...aws-aws-alb-ingress-controller-overlays-vpc_test.go | 5 ++++- tests/cert-manager-cert-manager-base_test.go | 3 +++ ...t-manager-cert-manager-overlays-application_test.go | 3 +++ ...t-manager-cert-manager-overlays-letsencrypt_test.go | 3 +++ ...t-manager-cert-manager-overlays-self-signed_test.go | 3 +++ tests/common-basic-auth-base_test.go | 4 ++++ tests/common-basic-auth-overlays-istio_test.go | 4 ++++ tests/common-centraldashboard-base_test.go | 2 ++ ...ommon-centraldashboard-overlays-application_test.go | 2 ++ tests/common-centraldashboard-overlays-istio_test.go | 2 ++ tests/common-spartakus-base_test.go | 2 ++ tests/common-spartakus-overlays-application_test.go | 2 ++ tests/gcp-cloud-endpoints-base_test.go | 2 ++ tests/gcp-cloud-endpoints-overlays-application_test.go | 2 ++ ...cp-cloud-endpoints-overlays-gcp-credentials_test.go | 2 ++ tests/jupyter-jupyter-web-app-base_test.go | 3 +++ ...upyter-jupyter-web-app-overlays-application_test.go | 3 +++ tests/jupyter-jupyter-web-app-overlays-istio_test.go | 3 +++ tests/jupyter-notebook-controller-base_test.go | 3 +++ ...er-notebook-controller-overlays-application_test.go | 3 +++ .../jupyter-notebook-controller-overlays-istio_test.go | 3 +++ tests/katib-katib-controller-base_test.go | 8 ++++++++ ...katib-katib-controller-overlays-application_test.go | 8 ++++++++ ...atib-controller-overlays-ibm-storage-config_test.go | 8 ++++++++ tests/katib-katib-controller-overlays-istio_test.go | 8 ++++++++ tests/kubebench-base_test.go | 2 ++ tests/kubebench-overlays-application_test.go | 2 ++ tests/kubebench-overlays-istio_test.go | 2 ++ tests/modeldb-base_test.go | 10 ++++++++++ tests/mpi-job-mpi-operator-base_test.go | 2 ++ .../mpi-job-mpi-operator-overlays-application_test.go | 2 ++ tests/mxnet-job-mxnet-operator-base_test.go | 2 ++ ...net-job-mxnet-operator-overlays-application_test.go | 2 ++ tests/pipeline-api-service-base_test.go | 9 ++++++--- .../pipeline-api-service-overlays-application_test.go | 9 ++++++--- tests/pipeline-minio-base_test.go | 3 +++ tests/pipeline-minio-overlays-application_test.go | 3 +++ tests/pipeline-minio-overlays-minioPd_test.go | 3 +++ tests/pipeline-mysql-base_test.go | 3 +++ tests/pipeline-mysql-overlays-application_test.go | 3 +++ tests/pipeline-mysql-overlays-mysqlPd_test.go | 3 +++ tests/pipeline-persistent-agent-base_test.go | 3 +++ ...eline-persistent-agent-overlays-application_test.go | 3 +++ ...ipeline-pipeline-visualization-service-base_test.go | 2 ++ ...-visualization-service-overlays-application_test.go | 2 ++ tests/pipeline-pipelines-ui-base_test.go | 2 ++ .../pipeline-pipelines-ui-overlays-application_test.go | 2 ++ tests/pipeline-pipelines-ui-overlays-gcp_test.go | 5 +++++ tests/pipeline-pipelines-ui-overlays-istio_test.go | 2 ++ tests/pipeline-pipelines-viewer-base_test.go | 3 +++ ...eline-pipelines-viewer-overlays-application_test.go | 3 +++ tests/pipeline-scheduledworkflow-base_test.go | 3 +++ ...line-scheduledworkflow-overlays-application_test.go | 3 +++ tests/profiles-base_test.go | 3 +++ tests/profiles-overlays-application_test.go | 3 +++ tests/profiles-overlays-debug_test.go | 3 +++ tests/profiles-overlays-devices_test.go | 3 +++ tests/profiles-overlays-istio_test.go | 3 +++ tests/profiles-overlays-test_test.go | 3 +++ tests/pytorch-job-pytorch-operator-base_test.go | 2 ++ ...h-job-pytorch-operator-overlays-application_test.go | 2 ++ tests/spark-spark-operator-base_test.go | 1 + .../spark-spark-operator-overlays-application_test.go | 1 + tests/tektoncd-tektoncd-dashboard-base_test.go | 2 ++ ...ncd-tektoncd-dashboard-overlays-application_test.go | 2 ++ .../tektoncd-tektoncd-dashboard-overlays-istio_test.go | 2 ++ tests/tektoncd-tektoncd-install-base_test.go | 2 ++ ...toncd-tektoncd-install-overlays-application_test.go | 2 ++ tests/tektoncd-tektoncd-install-overlays-istio_test.go | 2 ++ tests/tensorboard-base_test.go | 2 ++ tests/tensorboard-overlays-istio_test.go | 2 ++ 113 files changed, 327 insertions(+), 17 deletions(-) diff --git a/admission-webhook/webhook/base/deployment.yaml b/admission-webhook/webhook/base/deployment.yaml index fae67ec3ed..2b0d28a960 100644 --- a/admission-webhook/webhook/base/deployment.yaml +++ b/admission-webhook/webhook/base/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c @@ -16,4 +19,4 @@ spec: - name: webhook-cert secret: secretName: webhook-certs - serviceAccountName: service-account + serviceAccountName: service-account diff --git a/aws/aws-alb-ingress-controller/base/deployment.yaml b/aws/aws-alb-ingress-controller/base/deployment.yaml index ca7da33d2e..08620515b6 100644 --- a/aws/aws-alb-ingress-controller/base/deployment.yaml +++ b/aws/aws-alb-ingress-controller/base/deployment.yaml @@ -17,6 +17,8 @@ spec: metadata: labels: app.kubernetes.io/name: alb-ingress-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: alb-ingress-controller @@ -48,4 +50,4 @@ spec: # Repository location of the ALB Ingress Controller. image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2 imagePullPolicy: Always - serviceAccountName: alb-ingress-controller \ No newline at end of file + serviceAccountName: alb-ingress-controller diff --git a/cert-manager/cert-manager/base/deployment.yaml b/cert-manager/cert-manager/base/deployment.yaml index b0debd7d13..65806d959e 100644 --- a/cert-manager/cert-manager/base/deployment.yaml +++ b/cert-manager/cert-manager/base/deployment.yaml @@ -14,6 +14,7 @@ spec: labels: app: cainjector annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -52,6 +53,7 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -96,6 +98,7 @@ spec: labels: app: webhook annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/common/basic-auth/base/gatekeeper-deployment.yaml b/common/basic-auth/base/gatekeeper-deployment.yaml index e40d90b745..d422f365f7 100644 --- a/common/basic-auth/base/gatekeeper-deployment.yaml +++ b/common/basic-auth/base/gatekeeper-deployment.yaml @@ -13,6 +13,8 @@ spec: metadata: labels: app: basic-auth + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: app diff --git a/common/basic-auth/base/kflogin-deployment.yaml b/common/basic-auth/base/kflogin-deployment.yaml index 7ae8bbadf0..f547259b68 100644 --- a/common/basic-auth/base/kflogin-deployment.yaml +++ b/common/basic-auth/base/kflogin-deployment.yaml @@ -13,6 +13,8 @@ spec: metadata: labels: app: basic-auth-login + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: app diff --git a/common/centraldashboard/base/deployment.yaml b/common/centraldashboard/base/deployment.yaml index 72769f6d4b..0c761b9081 100644 --- a/common/centraldashboard/base/deployment.yaml +++ b/common/centraldashboard/base/deployment.yaml @@ -13,6 +13,8 @@ spec: metadata: labels: app: centraldashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/centraldashboard diff --git a/common/spartakus/base/deployment.yaml b/common/spartakus/base/deployment.yaml index c1544ebf1d..da7b5da929 100644 --- a/common/spartakus/base/deployment.yaml +++ b/common/spartakus/base/deployment.yaml @@ -10,6 +10,8 @@ spec: metadata: labels: app: spartakus-volunteer + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/gcp/cloud-endpoints/base/deployment.yaml b/gcp/cloud-endpoints/base/deployment.yaml index 2d6e822eb8..2e60524142 100644 --- a/gcp/cloud-endpoints/base/deployment.yaml +++ b/gcp/cloud-endpoints/base/deployment.yaml @@ -8,6 +8,8 @@ spec: metadata: labels: app: cloud-endpoints-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/cloud-solutions-group/cloud-endpoints-controller:0.2.1 diff --git a/jupyter/jupyter-web-app/base/deployment.yaml b/jupyter/jupyter-web-app/base/deployment.yaml index 6eb2cc454f..fd379d200e 100644 --- a/jupyter/jupyter-web-app/base/deployment.yaml +++ b/jupyter/jupyter-web-app/base/deployment.yaml @@ -5,6 +5,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/jupyter/notebook-controller/base/deployment.yaml b/jupyter/notebook-controller/base/deployment.yaml index 1b425c92e9..5c36f78ee5 100644 --- a/jupyter/notebook-controller/base/deployment.yaml +++ b/jupyter/notebook-controller/base/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: manager diff --git a/katib/katib-controller/base/katib-controller-deployment.yaml b/katib/katib-controller/base/katib-controller-deployment.yaml index b1cb0a505c..1f37ccd8f4 100644 --- a/katib/katib-controller/base/katib-controller-deployment.yaml +++ b/katib/katib-controller/base/katib-controller-deployment.yaml @@ -13,6 +13,8 @@ spec: metadata: labels: app: katib-controller + annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: katib-controller containers: diff --git a/katib/katib-controller/base/katib-db-deployment.yaml b/katib/katib-controller/base/katib-db-deployment.yaml index 87345391f6..4f2b7cb5fe 100644 --- a/katib/katib-controller/base/katib-db-deployment.yaml +++ b/katib/katib-controller/base/katib-db-deployment.yaml @@ -17,6 +17,8 @@ spec: labels: app: katib component: db + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-db diff --git a/katib/katib-controller/base/katib-manager-deployment.yaml b/katib/katib-controller/base/katib-manager-deployment.yaml index 27ed68ba2f..d1235ea164 100644 --- a/katib/katib-controller/base/katib-manager-deployment.yaml +++ b/katib/katib-controller/base/katib-manager-deployment.yaml @@ -17,6 +17,8 @@ spec: labels: app: katib component: manager + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-manager diff --git a/katib/katib-controller/base/katib-ui-deployment.yaml b/katib/katib-controller/base/katib-ui-deployment.yaml index 38a5415c58..0a1d530a7c 100644 --- a/katib/katib-controller/base/katib-ui-deployment.yaml +++ b/katib/katib-controller/base/katib-ui-deployment.yaml @@ -17,6 +17,8 @@ spec: labels: app: katib component: ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-ui diff --git a/kubebench/base/deployment.yaml b/kubebench/base/deployment.yaml index 1198d75756..441e0c314b 100644 --- a/kubebench/base/deployment.yaml +++ b/kubebench/base/deployment.yaml @@ -10,6 +10,8 @@ spec: metadata: labels: app: kubebench-operator + annotations: + sidecar.istio.io/inject: "false" spec: volumes: - name: kubebench-config diff --git a/modeldb/base/artifact-store-deployment.yaml b/modeldb/base/artifact-store-deployment.yaml index d72adab0a7..cf66617264 100644 --- a/modeldb/base/artifact-store-deployment.yaml +++ b/modeldb/base/artifact-store-deployment.yaml @@ -17,6 +17,8 @@ spec: labels: app: modeldb tier: artifact-store + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/modeldb/base/backend-deployment.yaml b/modeldb/base/backend-deployment.yaml index 7b9ed8b1f1..361562b628 100644 --- a/modeldb/base/backend-deployment.yaml +++ b/modeldb/base/backend-deployment.yaml @@ -16,6 +16,8 @@ spec: labels: app: modeldb tier: backend + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/modeldb/base/mysql-backend-deployment.yaml b/modeldb/base/mysql-backend-deployment.yaml index 9eb2ee3a4b..875c0cdb07 100644 --- a/modeldb/base/mysql-backend-deployment.yaml +++ b/modeldb/base/mysql-backend-deployment.yaml @@ -16,6 +16,8 @@ spec: labels: app: modeldb tier: mysql + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/modeldb/base/proxy-deployment.yaml b/modeldb/base/proxy-deployment.yaml index f9d3864eaa..30d583944e 100644 --- a/modeldb/base/proxy-deployment.yaml +++ b/modeldb/base/proxy-deployment.yaml @@ -16,6 +16,8 @@ spec: labels: app: modeldb tier: backend-proxy + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/modeldb/base/webapp-deplyment.yaml b/modeldb/base/webapp-deplyment.yaml index c545f42019..bf01fc6d5b 100644 --- a/modeldb/base/webapp-deplyment.yaml +++ b/modeldb/base/webapp-deplyment.yaml @@ -16,6 +16,8 @@ spec: labels: app: modeldb tier: webapp + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: vertaaiofficial/modeldb-frontend:kubeflow diff --git a/mpi-job/mpi-operator/base/deployment.yaml b/mpi-job/mpi-operator/base/deployment.yaml index 5ab792a2fa..80dd1b6a27 100644 --- a/mpi-job/mpi-operator/base/deployment.yaml +++ b/mpi-job/mpi-operator/base/deployment.yaml @@ -11,6 +11,8 @@ spec: metadata: labels: app: mpi-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/mxnet-job/mxnet-operator/base/deployment.yaml b/mxnet-job/mxnet-operator/base/deployment.yaml index 03b7e97ebf..b7de789f14 100644 --- a/mxnet-job/mxnet-operator/base/deployment.yaml +++ b/mxnet-job/mxnet-operator/base/deployment.yaml @@ -8,6 +8,8 @@ spec: metadata: labels: name: mxnet-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/pipeline/api-service/base/deployment.yaml b/pipeline/api-service/base/deployment.yaml index 424e79b887..67c3eeb1e6 100644 --- a/pipeline/api-service/base/deployment.yaml +++ b/pipeline/api-service/base/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: ml-pipeline spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-api-server @@ -15,9 +18,9 @@ spec: image: gcr.io/ml-pipeline/api-server imagePullPolicy: IfNotPresent command: - - apiserver + - apiserver - --config=/etc/ml-pipeline-config - - --sampleconfig=/config/sample_config.json + - --sampleconfig=/config/sample_config.json - -logtostderr=true ports: - containerPort: 8888 @@ -25,7 +28,7 @@ spec: volumeMounts: - name: config-volume mountPath: /etc/ml-pipeline-config - serviceAccountName: ml-pipeline + serviceAccountName: ml-pipeline volumes: - name: config-volume configMap: diff --git a/pipeline/minio/base/deployment.yaml b/pipeline/minio/base/deployment.yaml index 20da439ed4..8bd11d397c 100644 --- a/pipeline/minio/base/deployment.yaml +++ b/pipeline/minio/base/deployment.yaml @@ -6,6 +6,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: minio diff --git a/pipeline/mysql/base/deployment.yaml b/pipeline/mysql/base/deployment.yaml index 185b12f804..34c222cf17 100644 --- a/pipeline/mysql/base/deployment.yaml +++ b/pipeline/mysql/base/deployment.yaml @@ -6,6 +6,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: mysql diff --git a/pipeline/persistent-agent/base/deployment.yaml b/pipeline/persistent-agent/base/deployment.yaml index 1e7aaaac5e..7c2e012777 100644 --- a/pipeline/persistent-agent/base/deployment.yaml +++ b/pipeline/persistent-agent/base/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: persistenceagent spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-persistenceagent diff --git a/pipeline/pipeline-visualization-service/base/deployment.yaml b/pipeline/pipeline-visualization-service/base/deployment.yaml index 8df3056c78..a48dc84009 100644 --- a/pipeline/pipeline-visualization-service/base/deployment.yaml +++ b/pipeline/pipeline-visualization-service/base/deployment.yaml @@ -12,6 +12,8 @@ spec: metadata: labels: app: ml-pipeline-visualizationserver + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/ml-pipeline/visualization-server diff --git a/pipeline/pipelines-ui/base/deployment.yaml b/pipeline/pipelines-ui/base/deployment.yaml index e380ccbe60..fd9d25bac4 100644 --- a/pipeline/pipelines-ui/base/deployment.yaml +++ b/pipeline/pipelines-ui/base/deployment.yaml @@ -12,6 +12,8 @@ spec: metadata: labels: app: ml-pipeline-ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-ui diff --git a/pipeline/pipelines-ui/overlays/gcp/deployment.yaml b/pipeline/pipelines-ui/overlays/gcp/deployment.yaml index 490d8d1415..d14d1436b3 100644 --- a/pipeline/pipelines-ui/overlays/gcp/deployment.yaml +++ b/pipeline/pipelines-ui/overlays/gcp/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: ml-pipeline-ui spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: volumes: - name: gcp-sa-token diff --git a/pipeline/pipelines-viewer/base/deployment.yaml b/pipeline/pipelines-viewer/base/deployment.yaml index bad9bdf03d..6115812097 100644 --- a/pipeline/pipelines-viewer/base/deployment.yaml +++ b/pipeline/pipelines-viewer/base/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: controller-deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/pipeline/scheduledworkflow/base/deployment.yaml b/pipeline/scheduledworkflow/base/deployment.yaml index 1664f8a7eb..5dcd152728 100644 --- a/pipeline/scheduledworkflow/base/deployment.yaml +++ b/pipeline/scheduledworkflow/base/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: ml-pipeline-scheduledworkflow spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-scheduledworkflow diff --git a/profiles/base/deployment.yaml b/profiles/base/deployment.yaml index 990cc9ddd6..cebf4324e8 100644 --- a/profiles/base/deployment.yaml +++ b/profiles/base/deployment.yaml @@ -5,6 +5,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/pytorch-job/pytorch-operator/base/deployment.yaml b/pytorch-job/pytorch-operator/base/deployment.yaml index 65ec3a2210..4e1f6a8bde 100644 --- a/pytorch-job/pytorch-operator/base/deployment.yaml +++ b/pytorch-job/pytorch-operator/base/deployment.yaml @@ -11,6 +11,8 @@ spec: metadata: labels: name: pytorch-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/spark/spark-operator/base/deploy.yaml b/spark/spark-operator/base/deploy.yaml index 7178a43f9f..09bc959c27 100644 --- a/spark/spark-operator/base/deploy.yaml +++ b/spark/spark-operator/base/deploy.yaml @@ -16,6 +16,7 @@ spec: prometheus.io/path: /metrics prometheus.io/port: "10254" prometheus.io/scrape: "true" + sidecar.istio.io/inject: "false" initializers: pending: [] labels: diff --git a/tektoncd/tektoncd-dashboard/base/deployment.yaml b/tektoncd/tektoncd-dashboard/base/deployment.yaml index 2b4af356ad..c04d07f552 100644 --- a/tektoncd/tektoncd-dashboard/base/deployment.yaml +++ b/tektoncd/tektoncd-dashboard/base/deployment.yaml @@ -7,6 +7,8 @@ spec: template: metadata: name: tekton-dashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: tekton-dashboard diff --git a/tektoncd/tektoncd-install/base/deployment.yaml b/tektoncd/tektoncd-install/base/deployment.yaml index b0d531f0a2..267a4ab915 100644 --- a/tektoncd/tektoncd-install/base/deployment.yaml +++ b/tektoncd/tektoncd-install/base/deployment.yaml @@ -15,6 +15,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-controller # app.kubernetes.io/component: controller @@ -83,6 +84,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-webhook # app.kubernetes.io/component: webhook-controller diff --git a/tensorboard/base/deployment.yaml b/tensorboard/base/deployment.yaml index ebafcbc100..12a856d24c 100644 --- a/tensorboard/base/deployment.yaml +++ b/tensorboard/base/deployment.yaml @@ -10,6 +10,8 @@ spec: metadata: labels: app: tensorboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/tests/admission-webhook-webhook-base_test.go b/tests/admission-webhook-webhook-base_test.go index a1d27fc1dd..9f1dea60f2 100644 --- a/tests/admission-webhook-webhook-base_test.go +++ b/tests/admission-webhook-webhook-base_test.go @@ -101,6 +101,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c @@ -113,7 +116,7 @@ spec: - name: webhook-cert secret: secretName: webhook-certs - serviceAccountName: service-account + serviceAccountName: service-account `) th.writeF("/manifests/admission-webhook/webhook/base/mutating-webhook-configuration.yaml", ` apiVersion: admissionregistration.k8s.io/v1beta1 diff --git a/tests/admission-webhook-webhook-overlays-application_test.go b/tests/admission-webhook-webhook-overlays-application_test.go index 4f281914e7..bc4f618ed9 100644 --- a/tests/admission-webhook-webhook-overlays-application_test.go +++ b/tests/admission-webhook-webhook-overlays-application_test.go @@ -156,6 +156,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c @@ -168,7 +171,7 @@ spec: - name: webhook-cert secret: secretName: webhook-certs - serviceAccountName: service-account + serviceAccountName: service-account `) th.writeF("/manifests/admission-webhook/webhook/base/mutating-webhook-configuration.yaml", ` apiVersion: admissionregistration.k8s.io/v1beta1 diff --git a/tests/admission-webhook-webhook-overlays-cert-manager_test.go b/tests/admission-webhook-webhook-overlays-cert-manager_test.go index 147518fabf..72cdf1633d 100644 --- a/tests/admission-webhook-webhook-overlays-cert-manager_test.go +++ b/tests/admission-webhook-webhook-overlays-cert-manager_test.go @@ -188,6 +188,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c @@ -200,7 +203,7 @@ spec: - name: webhook-cert secret: secretName: webhook-certs - serviceAccountName: service-account + serviceAccountName: service-account `) th.writeF("/manifests/admission-webhook/webhook/base/mutating-webhook-configuration.yaml", ` apiVersion: admissionregistration.k8s.io/v1beta1 diff --git a/tests/aws-aws-alb-ingress-controller-base_test.go b/tests/aws-aws-alb-ingress-controller-base_test.go index e8f0e31fab..4db04674ef 100644 --- a/tests/aws-aws-alb-ingress-controller-base_test.go +++ b/tests/aws-aws-alb-ingress-controller-base_test.go @@ -84,6 +84,8 @@ spec: metadata: labels: app.kubernetes.io/name: alb-ingress-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: alb-ingress-controller @@ -115,7 +117,8 @@ spec: # Repository location of the ALB Ingress Controller. image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2 imagePullPolicy: Always - serviceAccountName: alb-ingress-controller`) + serviceAccountName: alb-ingress-controller +`) th.writeF("/manifests/aws/aws-alb-ingress-controller/base/service-account.yaml", ` apiVersion: v1 kind: ServiceAccount diff --git a/tests/aws-aws-alb-ingress-controller-overlays-application_test.go b/tests/aws-aws-alb-ingress-controller-overlays-application_test.go index b6628989b8..b5b80b660a 100644 --- a/tests/aws-aws-alb-ingress-controller-overlays-application_test.go +++ b/tests/aws-aws-alb-ingress-controller-overlays-application_test.go @@ -136,6 +136,8 @@ spec: metadata: labels: app.kubernetes.io/name: alb-ingress-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: alb-ingress-controller @@ -167,7 +169,8 @@ spec: # Repository location of the ALB Ingress Controller. image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2 imagePullPolicy: Always - serviceAccountName: alb-ingress-controller`) + serviceAccountName: alb-ingress-controller +`) th.writeF("/manifests/aws/aws-alb-ingress-controller/base/service-account.yaml", ` apiVersion: v1 kind: ServiceAccount diff --git a/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go b/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go index d01d94dbdc..5483f79b40 100644 --- a/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go +++ b/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go @@ -141,6 +141,8 @@ spec: metadata: labels: app.kubernetes.io/name: alb-ingress-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: alb-ingress-controller @@ -172,7 +174,8 @@ spec: # Repository location of the ALB Ingress Controller. image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2 imagePullPolicy: Always - serviceAccountName: alb-ingress-controller`) + serviceAccountName: alb-ingress-controller +`) th.writeF("/manifests/aws/aws-alb-ingress-controller/base/service-account.yaml", ` apiVersion: v1 kind: ServiceAccount diff --git a/tests/cert-manager-cert-manager-base_test.go b/tests/cert-manager-cert-manager-base_test.go index f59b2fae10..a9ca046a51 100644 --- a/tests/cert-manager-cert-manager-base_test.go +++ b/tests/cert-manager-cert-manager-base_test.go @@ -459,6 +459,7 @@ spec: labels: app: cainjector annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -497,6 +498,7 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -541,6 +543,7 @@ spec: labels: app: webhook annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-application_test.go b/tests/cert-manager-cert-manager-overlays-application_test.go index 67889a36c7..c6e7f9b2b9 100644 --- a/tests/cert-manager-cert-manager-overlays-application_test.go +++ b/tests/cert-manager-cert-manager-overlays-application_test.go @@ -526,6 +526,7 @@ spec: labels: app: cainjector annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -564,6 +565,7 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -608,6 +610,7 @@ spec: labels: app: webhook annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go b/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go index c21e13618d..7562f1a5e2 100644 --- a/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go +++ b/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go @@ -517,6 +517,7 @@ spec: labels: app: cainjector annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -555,6 +556,7 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -599,6 +601,7 @@ spec: labels: app: webhook annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-self-signed_test.go b/tests/cert-manager-cert-manager-overlays-self-signed_test.go index e472e9d1c3..c860797fd1 100644 --- a/tests/cert-manager-cert-manager-overlays-self-signed_test.go +++ b/tests/cert-manager-cert-manager-overlays-self-signed_test.go @@ -477,6 +477,7 @@ spec: labels: app: cainjector annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -515,6 +516,7 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -559,6 +561,7 @@ spec: labels: app: webhook annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/common-basic-auth-base_test.go b/tests/common-basic-auth-base_test.go index 3dfed6636f..84e04af01d 100644 --- a/tests/common-basic-auth-base_test.go +++ b/tests/common-basic-auth-base_test.go @@ -30,6 +30,8 @@ spec: metadata: labels: app: basic-auth-login + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: app @@ -53,6 +55,8 @@ spec: metadata: labels: app: basic-auth + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: app diff --git a/tests/common-basic-auth-overlays-istio_test.go b/tests/common-basic-auth-overlays-istio_test.go index ec674e6262..39302ee353 100644 --- a/tests/common-basic-auth-overlays-istio_test.go +++ b/tests/common-basic-auth-overlays-istio_test.go @@ -67,6 +67,8 @@ spec: metadata: labels: app: basic-auth-login + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: app @@ -90,6 +92,8 @@ spec: metadata: labels: app: basic-auth + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: app diff --git a/tests/common-centraldashboard-base_test.go b/tests/common-centraldashboard-base_test.go index 874d4f7fec..474b92945f 100644 --- a/tests/common-centraldashboard-base_test.go +++ b/tests/common-centraldashboard-base_test.go @@ -65,6 +65,8 @@ spec: metadata: labels: app: centraldashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/centraldashboard diff --git a/tests/common-centraldashboard-overlays-application_test.go b/tests/common-centraldashboard-overlays-application_test.go index f355137d87..b09ff8aa60 100644 --- a/tests/common-centraldashboard-overlays-application_test.go +++ b/tests/common-centraldashboard-overlays-application_test.go @@ -136,6 +136,8 @@ spec: metadata: labels: app: centraldashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/centraldashboard diff --git a/tests/common-centraldashboard-overlays-istio_test.go b/tests/common-centraldashboard-overlays-istio_test.go index e697826ba2..567ee72a7d 100644 --- a/tests/common-centraldashboard-overlays-istio_test.go +++ b/tests/common-centraldashboard-overlays-istio_test.go @@ -103,6 +103,8 @@ spec: metadata: labels: app: centraldashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/kubeflow-images-public/centraldashboard diff --git a/tests/common-spartakus-base_test.go b/tests/common-spartakus-base_test.go index 9eb12f21ec..90e13d1d8c 100644 --- a/tests/common-spartakus-base_test.go +++ b/tests/common-spartakus-base_test.go @@ -58,6 +58,8 @@ spec: metadata: labels: app: spartakus-volunteer + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/tests/common-spartakus-overlays-application_test.go b/tests/common-spartakus-overlays-application_test.go index 8f5d2b10d9..a0146cf09e 100644 --- a/tests/common-spartakus-overlays-application_test.go +++ b/tests/common-spartakus-overlays-application_test.go @@ -108,6 +108,8 @@ spec: metadata: labels: app: spartakus-volunteer + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/tests/gcp-cloud-endpoints-base_test.go b/tests/gcp-cloud-endpoints-base_test.go index bb04da87d0..c558d7008f 100644 --- a/tests/gcp-cloud-endpoints-base_test.go +++ b/tests/gcp-cloud-endpoints-base_test.go @@ -100,6 +100,8 @@ spec: metadata: labels: app: cloud-endpoints-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/cloud-solutions-group/cloud-endpoints-controller:0.2.1 diff --git a/tests/gcp-cloud-endpoints-overlays-application_test.go b/tests/gcp-cloud-endpoints-overlays-application_test.go index 6071a16721..d0aa6d08fe 100644 --- a/tests/gcp-cloud-endpoints-overlays-application_test.go +++ b/tests/gcp-cloud-endpoints-overlays-application_test.go @@ -148,6 +148,8 @@ spec: metadata: labels: app: cloud-endpoints-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/cloud-solutions-group/cloud-endpoints-controller:0.2.1 diff --git a/tests/gcp-cloud-endpoints-overlays-gcp-credentials_test.go b/tests/gcp-cloud-endpoints-overlays-gcp-credentials_test.go index dfb3a5af91..238d9643d5 100644 --- a/tests/gcp-cloud-endpoints-overlays-gcp-credentials_test.go +++ b/tests/gcp-cloud-endpoints-overlays-gcp-credentials_test.go @@ -131,6 +131,8 @@ spec: metadata: labels: app: cloud-endpoints-controller + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/cloud-solutions-group/cloud-endpoints-controller:0.2.1 diff --git a/tests/jupyter-jupyter-web-app-base_test.go b/tests/jupyter-jupyter-web-app-base_test.go index 26ff658102..4d9b731626 100644 --- a/tests/jupyter-jupyter-web-app-base_test.go +++ b/tests/jupyter-jupyter-web-app-base_test.go @@ -220,6 +220,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/tests/jupyter-jupyter-web-app-overlays-application_test.go b/tests/jupyter-jupyter-web-app-overlays-application_test.go index 95e199d20b..50283e9ee4 100644 --- a/tests/jupyter-jupyter-web-app-overlays-application_test.go +++ b/tests/jupyter-jupyter-web-app-overlays-application_test.go @@ -286,6 +286,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/tests/jupyter-jupyter-web-app-overlays-istio_test.go b/tests/jupyter-jupyter-web-app-overlays-istio_test.go index bedfde02d3..6bbef2f623 100644 --- a/tests/jupyter-jupyter-web-app-overlays-istio_test.go +++ b/tests/jupyter-jupyter-web-app-overlays-istio_test.go @@ -259,6 +259,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/tests/jupyter-notebook-controller-base_test.go b/tests/jupyter-notebook-controller-base_test.go index 278c4d10ae..55f0ffe2cd 100644 --- a/tests/jupyter-notebook-controller-base_test.go +++ b/tests/jupyter-notebook-controller-base_test.go @@ -213,6 +213,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: manager diff --git a/tests/jupyter-notebook-controller-overlays-application_test.go b/tests/jupyter-notebook-controller-overlays-application_test.go index c2fa46bbdd..373fed6973 100644 --- a/tests/jupyter-notebook-controller-overlays-application_test.go +++ b/tests/jupyter-notebook-controller-overlays-application_test.go @@ -269,6 +269,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: manager diff --git a/tests/jupyter-notebook-controller-overlays-istio_test.go b/tests/jupyter-notebook-controller-overlays-istio_test.go index def5135928..ba09becf57 100644 --- a/tests/jupyter-notebook-controller-overlays-istio_test.go +++ b/tests/jupyter-notebook-controller-overlays-istio_test.go @@ -247,6 +247,9 @@ metadata: name: deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: manager diff --git a/tests/katib-katib-controller-base_test.go b/tests/katib-katib-controller-base_test.go index 396d8d6867..cf6dfedd42 100644 --- a/tests/katib-katib-controller-base_test.go +++ b/tests/katib-katib-controller-base_test.go @@ -70,6 +70,8 @@ spec: metadata: labels: app: katib-controller + annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: katib-controller containers: @@ -286,6 +288,8 @@ spec: labels: app: katib component: db + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-db @@ -391,6 +395,8 @@ spec: labels: app: katib component: manager + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-manager @@ -458,6 +464,8 @@ spec: labels: app: katib component: ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-ui diff --git a/tests/katib-katib-controller-overlays-application_test.go b/tests/katib-katib-controller-overlays-application_test.go index 8116c29fa6..706d2cccad 100644 --- a/tests/katib-katib-controller-overlays-application_test.go +++ b/tests/katib-katib-controller-overlays-application_test.go @@ -149,6 +149,8 @@ spec: metadata: labels: app: katib-controller + annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: katib-controller containers: @@ -365,6 +367,8 @@ spec: labels: app: katib component: db + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-db @@ -470,6 +474,8 @@ spec: labels: app: katib component: manager + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-manager @@ -537,6 +543,8 @@ spec: labels: app: katib component: ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-ui diff --git a/tests/katib-katib-controller-overlays-ibm-storage-config_test.go b/tests/katib-katib-controller-overlays-ibm-storage-config_test.go index 7328d59c81..04165167f4 100644 --- a/tests/katib-katib-controller-overlays-ibm-storage-config_test.go +++ b/tests/katib-katib-controller-overlays-ibm-storage-config_test.go @@ -95,6 +95,8 @@ spec: metadata: labels: app: katib-controller + annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: katib-controller containers: @@ -311,6 +313,8 @@ spec: labels: app: katib component: db + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-db @@ -416,6 +420,8 @@ spec: labels: app: katib component: manager + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-manager @@ -483,6 +489,8 @@ spec: labels: app: katib component: ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-ui diff --git a/tests/katib-katib-controller-overlays-istio_test.go b/tests/katib-katib-controller-overlays-istio_test.go index 4de60b1f6d..71389aa15e 100644 --- a/tests/katib-katib-controller-overlays-istio_test.go +++ b/tests/katib-katib-controller-overlays-istio_test.go @@ -107,6 +107,8 @@ spec: metadata: labels: app: katib-controller + annotations: + sidecar.istio.io/inject: "false" spec: serviceAccountName: katib-controller containers: @@ -323,6 +325,8 @@ spec: labels: app: katib component: db + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-db @@ -428,6 +432,8 @@ spec: labels: app: katib component: manager + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-manager @@ -495,6 +501,8 @@ spec: labels: app: katib component: ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: katib-ui diff --git a/tests/kubebench-base_test.go b/tests/kubebench-base_test.go index c9f027320e..66aec00d12 100644 --- a/tests/kubebench-base_test.go +++ b/tests/kubebench-base_test.go @@ -120,6 +120,8 @@ spec: metadata: labels: app: kubebench-operator + annotations: + sidecar.istio.io/inject: "false" spec: volumes: - name: kubebench-config diff --git a/tests/kubebench-overlays-application_test.go b/tests/kubebench-overlays-application_test.go index bae7b91d1b..daaa4043c3 100644 --- a/tests/kubebench-overlays-application_test.go +++ b/tests/kubebench-overlays-application_test.go @@ -168,6 +168,8 @@ spec: metadata: labels: app: kubebench-operator + annotations: + sidecar.istio.io/inject: "false" spec: volumes: - name: kubebench-config diff --git a/tests/kubebench-overlays-istio_test.go b/tests/kubebench-overlays-istio_test.go index dee790fe25..ad40477805 100644 --- a/tests/kubebench-overlays-istio_test.go +++ b/tests/kubebench-overlays-istio_test.go @@ -157,6 +157,8 @@ spec: metadata: labels: app: kubebench-operator + annotations: + sidecar.istio.io/inject: "false" spec: volumes: - name: kubebench-config diff --git a/tests/modeldb-base_test.go b/tests/modeldb-base_test.go index 593981bcb7..34b16f996e 100644 --- a/tests/modeldb-base_test.go +++ b/tests/modeldb-base_test.go @@ -34,6 +34,8 @@ spec: labels: app: modeldb tier: artifact-store + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: @@ -88,6 +90,8 @@ spec: labels: app: modeldb tier: backend + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: @@ -176,6 +180,8 @@ spec: labels: app: modeldb tier: mysql + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: @@ -245,6 +251,8 @@ spec: labels: app: modeldb tier: backend-proxy + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: @@ -323,6 +331,8 @@ spec: labels: app: modeldb tier: webapp + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: vertaaiofficial/modeldb-frontend:kubeflow diff --git a/tests/mpi-job-mpi-operator-base_test.go b/tests/mpi-job-mpi-operator-base_test.go index 61cd325e51..e8c17a5fff 100644 --- a/tests/mpi-job-mpi-operator-base_test.go +++ b/tests/mpi-job-mpi-operator-base_test.go @@ -229,6 +229,8 @@ spec: metadata: labels: app: mpi-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/tests/mpi-job-mpi-operator-overlays-application_test.go b/tests/mpi-job-mpi-operator-overlays-application_test.go index e840989ed4..cd1f8677b0 100644 --- a/tests/mpi-job-mpi-operator-overlays-application_test.go +++ b/tests/mpi-job-mpi-operator-overlays-application_test.go @@ -276,6 +276,8 @@ spec: metadata: labels: app: mpi-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/tests/mxnet-job-mxnet-operator-base_test.go b/tests/mxnet-job-mxnet-operator-base_test.go index 9316de7bd3..2e4942619e 100644 --- a/tests/mxnet-job-mxnet-operator-base_test.go +++ b/tests/mxnet-job-mxnet-operator-base_test.go @@ -103,6 +103,8 @@ spec: metadata: labels: name: mxnet-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/mxnet-job-mxnet-operator-overlays-application_test.go b/tests/mxnet-job-mxnet-operator-overlays-application_test.go index 32cdf83216..d4edc18edd 100644 --- a/tests/mxnet-job-mxnet-operator-overlays-application_test.go +++ b/tests/mxnet-job-mxnet-operator-overlays-application_test.go @@ -158,6 +158,8 @@ spec: metadata: labels: name: mxnet-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/pipeline-api-service-base_test.go b/tests/pipeline-api-service-base_test.go index ef45ba827b..f5dedf37b3 100644 --- a/tests/pipeline-api-service-base_test.go +++ b/tests/pipeline-api-service-base_test.go @@ -48,6 +48,9 @@ metadata: name: ml-pipeline spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-api-server @@ -59,9 +62,9 @@ spec: image: gcr.io/ml-pipeline/api-server imagePullPolicy: IfNotPresent command: - - apiserver + - apiserver - --config=/etc/ml-pipeline-config - - --sampleconfig=/config/sample_config.json + - --sampleconfig=/config/sample_config.json - -logtostderr=true ports: - containerPort: 8888 @@ -69,7 +72,7 @@ spec: volumeMounts: - name: config-volume mountPath: /etc/ml-pipeline-config - serviceAccountName: ml-pipeline + serviceAccountName: ml-pipeline volumes: - name: config-volume configMap: diff --git a/tests/pipeline-api-service-overlays-application_test.go b/tests/pipeline-api-service-overlays-application_test.go index 2d16e00f23..13eef0c78a 100644 --- a/tests/pipeline-api-service-overlays-application_test.go +++ b/tests/pipeline-api-service-overlays-application_test.go @@ -96,6 +96,9 @@ metadata: name: ml-pipeline spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-api-server @@ -107,9 +110,9 @@ spec: image: gcr.io/ml-pipeline/api-server imagePullPolicy: IfNotPresent command: - - apiserver + - apiserver - --config=/etc/ml-pipeline-config - - --sampleconfig=/config/sample_config.json + - --sampleconfig=/config/sample_config.json - -logtostderr=true ports: - containerPort: 8888 @@ -117,7 +120,7 @@ spec: volumeMounts: - name: config-volume mountPath: /etc/ml-pipeline-config - serviceAccountName: ml-pipeline + serviceAccountName: ml-pipeline volumes: - name: config-volume configMap: diff --git a/tests/pipeline-minio-base_test.go b/tests/pipeline-minio-base_test.go index 9f5e487db5..60a1652817 100644 --- a/tests/pipeline-minio-base_test.go +++ b/tests/pipeline-minio-base_test.go @@ -23,6 +23,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: minio diff --git a/tests/pipeline-minio-overlays-application_test.go b/tests/pipeline-minio-overlays-application_test.go index 9403f1560a..edaba1b421 100644 --- a/tests/pipeline-minio-overlays-application_test.go +++ b/tests/pipeline-minio-overlays-application_test.go @@ -71,6 +71,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: minio diff --git a/tests/pipeline-minio-overlays-minioPd_test.go b/tests/pipeline-minio-overlays-minioPd_test.go index 95d12b15a7..351026146b 100644 --- a/tests/pipeline-minio-overlays-minioPd_test.go +++ b/tests/pipeline-minio-overlays-minioPd_test.go @@ -93,6 +93,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: minio diff --git a/tests/pipeline-mysql-base_test.go b/tests/pipeline-mysql-base_test.go index 0f794759e2..78696f794b 100644 --- a/tests/pipeline-mysql-base_test.go +++ b/tests/pipeline-mysql-base_test.go @@ -23,6 +23,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: mysql diff --git a/tests/pipeline-mysql-overlays-application_test.go b/tests/pipeline-mysql-overlays-application_test.go index bf66e47867..e951c8e520 100644 --- a/tests/pipeline-mysql-overlays-application_test.go +++ b/tests/pipeline-mysql-overlays-application_test.go @@ -71,6 +71,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: mysql diff --git a/tests/pipeline-mysql-overlays-mysqlPd_test.go b/tests/pipeline-mysql-overlays-mysqlPd_test.go index 369005ed98..a54b79c4cb 100644 --- a/tests/pipeline-mysql-overlays-mysqlPd_test.go +++ b/tests/pipeline-mysql-overlays-mysqlPd_test.go @@ -94,6 +94,9 @@ spec: strategy: type: Recreate template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: mysql diff --git a/tests/pipeline-persistent-agent-base_test.go b/tests/pipeline-persistent-agent-base_test.go index 991a3761e4..70da378647 100644 --- a/tests/pipeline-persistent-agent-base_test.go +++ b/tests/pipeline-persistent-agent-base_test.go @@ -57,6 +57,9 @@ metadata: name: persistenceagent spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-persistenceagent diff --git a/tests/pipeline-persistent-agent-overlays-application_test.go b/tests/pipeline-persistent-agent-overlays-application_test.go index de3f90628e..f37dabf903 100644 --- a/tests/pipeline-persistent-agent-overlays-application_test.go +++ b/tests/pipeline-persistent-agent-overlays-application_test.go @@ -105,6 +105,9 @@ metadata: name: persistenceagent spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-persistenceagent diff --git a/tests/pipeline-pipeline-visualization-service-base_test.go b/tests/pipeline-pipeline-visualization-service-base_test.go index c95b0f1c18..bd7e04ed71 100644 --- a/tests/pipeline-pipeline-visualization-service-base_test.go +++ b/tests/pipeline-pipeline-visualization-service-base_test.go @@ -29,6 +29,8 @@ spec: metadata: labels: app: ml-pipeline-visualizationserver + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/ml-pipeline/visualization-server diff --git a/tests/pipeline-pipeline-visualization-service-overlays-application_test.go b/tests/pipeline-pipeline-visualization-service-overlays-application_test.go index 2ca6af6e7a..03e99aedb9 100644 --- a/tests/pipeline-pipeline-visualization-service-overlays-application_test.go +++ b/tests/pipeline-pipeline-visualization-service-overlays-application_test.go @@ -77,6 +77,8 @@ spec: metadata: labels: app: ml-pipeline-visualizationserver + annotations: + sidecar.istio.io/inject: "false" spec: containers: - image: gcr.io/ml-pipeline/visualization-server diff --git a/tests/pipeline-pipelines-ui-base_test.go b/tests/pipeline-pipelines-ui-base_test.go index 1b7d8a62c5..d6348c9d72 100644 --- a/tests/pipeline-pipelines-ui-base_test.go +++ b/tests/pipeline-pipelines-ui-base_test.go @@ -29,6 +29,8 @@ spec: metadata: labels: app: ml-pipeline-ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-ui diff --git a/tests/pipeline-pipelines-ui-overlays-application_test.go b/tests/pipeline-pipelines-ui-overlays-application_test.go index f2d85d1d15..4a99bb833f 100644 --- a/tests/pipeline-pipelines-ui-overlays-application_test.go +++ b/tests/pipeline-pipelines-ui-overlays-application_test.go @@ -77,6 +77,8 @@ spec: metadata: labels: app: ml-pipeline-ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-ui diff --git a/tests/pipeline-pipelines-ui-overlays-gcp_test.go b/tests/pipeline-pipelines-ui-overlays-gcp_test.go index 2b7569339d..661caa4d5b 100644 --- a/tests/pipeline-pipelines-ui-overlays-gcp_test.go +++ b/tests/pipeline-pipelines-ui-overlays-gcp_test.go @@ -21,6 +21,9 @@ metadata: name: ml-pipeline-ui spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: volumes: - name: gcp-sa-token @@ -59,6 +62,8 @@ spec: metadata: labels: app: ml-pipeline-ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-ui diff --git a/tests/pipeline-pipelines-ui-overlays-istio_test.go b/tests/pipeline-pipelines-ui-overlays-istio_test.go index 62a9ffbd22..e33f1b54a0 100644 --- a/tests/pipeline-pipelines-ui-overlays-istio_test.go +++ b/tests/pipeline-pipelines-ui-overlays-istio_test.go @@ -89,6 +89,8 @@ spec: metadata: labels: app: ml-pipeline-ui + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-ui diff --git a/tests/pipeline-pipelines-viewer-base_test.go b/tests/pipeline-pipelines-viewer-base_test.go index f25f33d110..8f56d18c88 100644 --- a/tests/pipeline-pipelines-viewer-base_test.go +++ b/tests/pipeline-pipelines-viewer-base_test.go @@ -142,6 +142,9 @@ metadata: name: controller-deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/tests/pipeline-pipelines-viewer-overlays-application_test.go b/tests/pipeline-pipelines-viewer-overlays-application_test.go index fb4a51ede7..a3dfac26ca 100644 --- a/tests/pipeline-pipelines-viewer-overlays-application_test.go +++ b/tests/pipeline-pipelines-viewer-overlays-application_test.go @@ -190,6 +190,9 @@ metadata: name: controller-deployment spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - env: diff --git a/tests/pipeline-scheduledworkflow-base_test.go b/tests/pipeline-scheduledworkflow-base_test.go index a9017371bb..24f50219b3 100644 --- a/tests/pipeline-scheduledworkflow-base_test.go +++ b/tests/pipeline-scheduledworkflow-base_test.go @@ -98,6 +98,9 @@ metadata: name: ml-pipeline-scheduledworkflow spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-scheduledworkflow diff --git a/tests/pipeline-scheduledworkflow-overlays-application_test.go b/tests/pipeline-scheduledworkflow-overlays-application_test.go index 072b0ccfcb..88fe02ba6f 100644 --- a/tests/pipeline-scheduledworkflow-overlays-application_test.go +++ b/tests/pipeline-scheduledworkflow-overlays-application_test.go @@ -146,6 +146,9 @@ metadata: name: ml-pipeline-scheduledworkflow spec: template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: ml-pipeline-scheduledworkflow diff --git a/tests/profiles-base_test.go b/tests/profiles-base_test.go index 43ef304c48..c5fe5125d3 100644 --- a/tests/profiles-base_test.go +++ b/tests/profiles-base_test.go @@ -193,6 +193,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/profiles-overlays-application_test.go b/tests/profiles-overlays-application_test.go index f9bb336923..0477586d35 100644 --- a/tests/profiles-overlays-application_test.go +++ b/tests/profiles-overlays-application_test.go @@ -249,6 +249,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/profiles-overlays-debug_test.go b/tests/profiles-overlays-debug_test.go index 04d5cb293c..e5f3c8a656 100644 --- a/tests/profiles-overlays-debug_test.go +++ b/tests/profiles-overlays-debug_test.go @@ -252,6 +252,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/profiles-overlays-devices_test.go b/tests/profiles-overlays-devices_test.go index dab7f79bc1..038f584d8f 100644 --- a/tests/profiles-overlays-devices_test.go +++ b/tests/profiles-overlays-devices_test.go @@ -219,6 +219,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/profiles-overlays-istio_test.go b/tests/profiles-overlays-istio_test.go index 70b4b38b95..1f83af17a1 100644 --- a/tests/profiles-overlays-istio_test.go +++ b/tests/profiles-overlays-istio_test.go @@ -234,6 +234,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/profiles-overlays-test_test.go b/tests/profiles-overlays-test_test.go index a0aa547fe9..bba1aba4ad 100644 --- a/tests/profiles-overlays-test_test.go +++ b/tests/profiles-overlays-test_test.go @@ -201,6 +201,9 @@ metadata: spec: replicas: 1 template: + metadata: + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/pytorch-job-pytorch-operator-base_test.go b/tests/pytorch-job-pytorch-operator-base_test.go index 56bb9f161e..a5bb25ec04 100644 --- a/tests/pytorch-job-pytorch-operator-base_test.go +++ b/tests/pytorch-job-pytorch-operator-base_test.go @@ -131,6 +131,8 @@ spec: metadata: labels: name: pytorch-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/pytorch-job-pytorch-operator-overlays-application_test.go b/tests/pytorch-job-pytorch-operator-overlays-application_test.go index 3d3c80bcce..2f6ea3fcba 100644 --- a/tests/pytorch-job-pytorch-operator-overlays-application_test.go +++ b/tests/pytorch-job-pytorch-operator-overlays-application_test.go @@ -192,6 +192,8 @@ spec: metadata: labels: name: pytorch-operator + annotations: + sidecar.istio.io/inject: "false" spec: containers: - command: diff --git a/tests/spark-spark-operator-base_test.go b/tests/spark-spark-operator-base_test.go index 49f1f02495..f7fb8a68a4 100644 --- a/tests/spark-spark-operator-base_test.go +++ b/tests/spark-spark-operator-base_test.go @@ -153,6 +153,7 @@ spec: prometheus.io/path: /metrics prometheus.io/port: "10254" prometheus.io/scrape: "true" + sidecar.istio.io/inject: "false" initializers: pending: [] labels: diff --git a/tests/spark-spark-operator-overlays-application_test.go b/tests/spark-spark-operator-overlays-application_test.go index 25594083fb..67778b2bac 100644 --- a/tests/spark-spark-operator-overlays-application_test.go +++ b/tests/spark-spark-operator-overlays-application_test.go @@ -207,6 +207,7 @@ spec: prometheus.io/path: /metrics prometheus.io/port: "10254" prometheus.io/scrape: "true" + sidecar.istio.io/inject: "false" initializers: pending: [] labels: diff --git a/tests/tektoncd-tektoncd-dashboard-base_test.go b/tests/tektoncd-tektoncd-dashboard-base_test.go index 52cca4f036..ec052a21dd 100644 --- a/tests/tektoncd-tektoncd-dashboard-base_test.go +++ b/tests/tektoncd-tektoncd-dashboard-base_test.go @@ -103,6 +103,8 @@ spec: template: metadata: name: tekton-dashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: tekton-dashboard diff --git a/tests/tektoncd-tektoncd-dashboard-overlays-application_test.go b/tests/tektoncd-tektoncd-dashboard-overlays-application_test.go index d6a4f383c0..5c99f44b66 100644 --- a/tests/tektoncd-tektoncd-dashboard-overlays-application_test.go +++ b/tests/tektoncd-tektoncd-dashboard-overlays-application_test.go @@ -181,6 +181,8 @@ spec: template: metadata: name: tekton-dashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: tekton-dashboard diff --git a/tests/tektoncd-tektoncd-dashboard-overlays-istio_test.go b/tests/tektoncd-tektoncd-dashboard-overlays-istio_test.go index e540d0b169..e4b94694c2 100644 --- a/tests/tektoncd-tektoncd-dashboard-overlays-istio_test.go +++ b/tests/tektoncd-tektoncd-dashboard-overlays-istio_test.go @@ -163,6 +163,8 @@ spec: template: metadata: name: tekton-dashboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - name: tekton-dashboard diff --git a/tests/tektoncd-tektoncd-install-base_test.go b/tests/tektoncd-tektoncd-install-base_test.go index dd86c42634..6c8e755111 100644 --- a/tests/tektoncd-tektoncd-install-base_test.go +++ b/tests/tektoncd-tektoncd-install-base_test.go @@ -574,6 +574,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-controller # app.kubernetes.io/component: controller @@ -642,6 +643,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-webhook # app.kubernetes.io/component: webhook-controller diff --git a/tests/tektoncd-tektoncd-install-overlays-application_test.go b/tests/tektoncd-tektoncd-install-overlays-application_test.go index 8bea4c1b7f..25f29aff34 100644 --- a/tests/tektoncd-tektoncd-install-overlays-application_test.go +++ b/tests/tektoncd-tektoncd-install-overlays-application_test.go @@ -642,6 +642,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-controller # app.kubernetes.io/component: controller @@ -710,6 +711,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-webhook # app.kubernetes.io/component: webhook-controller diff --git a/tests/tektoncd-tektoncd-install-overlays-istio_test.go b/tests/tektoncd-tektoncd-install-overlays-istio_test.go index 18a48cde00..00bbc57323 100644 --- a/tests/tektoncd-tektoncd-install-overlays-istio_test.go +++ b/tests/tektoncd-tektoncd-install-overlays-istio_test.go @@ -635,6 +635,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-controller # app.kubernetes.io/component: controller @@ -703,6 +704,7 @@ spec: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + sidecar.istio.io/inject: "false" labels: app: tekton-pipelines-webhook # app.kubernetes.io/component: webhook-controller diff --git a/tests/tensorboard-base_test.go b/tests/tensorboard-base_test.go index 623bc217a3..f6ea71345e 100644 --- a/tests/tensorboard-base_test.go +++ b/tests/tensorboard-base_test.go @@ -27,6 +27,8 @@ spec: metadata: labels: app: tensorboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: diff --git a/tests/tensorboard-overlays-istio_test.go b/tests/tensorboard-overlays-istio_test.go index 4a89fd0735..eae9e4e785 100644 --- a/tests/tensorboard-overlays-istio_test.go +++ b/tests/tensorboard-overlays-istio_test.go @@ -64,6 +64,8 @@ spec: metadata: labels: app: tensorboard + annotations: + sidecar.istio.io/inject: "false" spec: containers: - args: From 5457aaf9ff0b02c367044a8d8f05339ea6f0d492 Mon Sep 17 00:00:00 2001 From: Yuan Gong Date: Tue, 21 Jan 2020 21:35:41 +0800 Subject: [PATCH 2/3] Revert cert-manager changes --- cert-manager/cert-manager/base/deployment.yaml | 4 ---- tests/cert-manager-cert-manager-base_test.go | 4 ---- tests/cert-manager-cert-manager-overlays-application_test.go | 4 ---- tests/cert-manager-cert-manager-overlays-letsencrypt_test.go | 4 ---- tests/cert-manager-cert-manager-overlays-self-signed_test.go | 4 ---- 5 files changed, 20 deletions(-) diff --git a/cert-manager/cert-manager/base/deployment.yaml b/cert-manager/cert-manager/base/deployment.yaml index 65806d959e..7ab35981c3 100644 --- a/cert-manager/cert-manager/base/deployment.yaml +++ b/cert-manager/cert-manager/base/deployment.yaml @@ -13,8 +13,6 @@ spec: metadata: labels: app: cainjector - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -97,8 +95,6 @@ spec: metadata: labels: app: webhook - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-base_test.go b/tests/cert-manager-cert-manager-base_test.go index a9ca046a51..3ab36464d7 100644 --- a/tests/cert-manager-cert-manager-base_test.go +++ b/tests/cert-manager-cert-manager-base_test.go @@ -458,8 +458,6 @@ spec: metadata: labels: app: cainjector - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -542,8 +540,6 @@ spec: metadata: labels: app: webhook - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-application_test.go b/tests/cert-manager-cert-manager-overlays-application_test.go index c6e7f9b2b9..19cbea8439 100644 --- a/tests/cert-manager-cert-manager-overlays-application_test.go +++ b/tests/cert-manager-cert-manager-overlays-application_test.go @@ -525,8 +525,6 @@ spec: metadata: labels: app: cainjector - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -609,8 +607,6 @@ spec: metadata: labels: app: webhook - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go b/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go index 7562f1a5e2..4d9ff65f54 100644 --- a/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go +++ b/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go @@ -516,8 +516,6 @@ spec: metadata: labels: app: cainjector - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -600,8 +598,6 @@ spec: metadata: labels: app: webhook - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-self-signed_test.go b/tests/cert-manager-cert-manager-overlays-self-signed_test.go index c860797fd1..26bfc95ba7 100644 --- a/tests/cert-manager-cert-manager-overlays-self-signed_test.go +++ b/tests/cert-manager-cert-manager-overlays-self-signed_test.go @@ -476,8 +476,6 @@ spec: metadata: labels: app: cainjector - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-cainjector containers: @@ -560,8 +558,6 @@ spec: metadata: labels: app: webhook - annotations: - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager-webhook containers: From d5efebe14ef34c0ec2d5b274fa6ff67c0957d51a Mon Sep 17 00:00:00 2001 From: Yuan Gong Date: Tue, 21 Jan 2020 21:42:14 +0800 Subject: [PATCH 3/3] Revert unneeded changes --- cert-manager/cert-manager/base/deployment.yaml | 3 ++- tests/cert-manager-cert-manager-base_test.go | 3 ++- tests/cert-manager-cert-manager-overlays-application_test.go | 3 ++- tests/cert-manager-cert-manager-overlays-letsencrypt_test.go | 3 ++- tests/cert-manager-cert-manager-overlays-self-signed_test.go | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cert-manager/cert-manager/base/deployment.yaml b/cert-manager/cert-manager/base/deployment.yaml index 7ab35981c3..b0debd7d13 100644 --- a/cert-manager/cert-manager/base/deployment.yaml +++ b/cert-manager/cert-manager/base/deployment.yaml @@ -13,6 +13,7 @@ spec: metadata: labels: app: cainjector + annotations: spec: serviceAccountName: cert-manager-cainjector containers: @@ -51,7 +52,6 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -95,6 +95,7 @@ spec: metadata: labels: app: webhook + annotations: spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-base_test.go b/tests/cert-manager-cert-manager-base_test.go index 3ab36464d7..f59b2fae10 100644 --- a/tests/cert-manager-cert-manager-base_test.go +++ b/tests/cert-manager-cert-manager-base_test.go @@ -458,6 +458,7 @@ spec: metadata: labels: app: cainjector + annotations: spec: serviceAccountName: cert-manager-cainjector containers: @@ -496,7 +497,6 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -540,6 +540,7 @@ spec: metadata: labels: app: webhook + annotations: spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-application_test.go b/tests/cert-manager-cert-manager-overlays-application_test.go index 19cbea8439..67889a36c7 100644 --- a/tests/cert-manager-cert-manager-overlays-application_test.go +++ b/tests/cert-manager-cert-manager-overlays-application_test.go @@ -525,6 +525,7 @@ spec: metadata: labels: app: cainjector + annotations: spec: serviceAccountName: cert-manager-cainjector containers: @@ -563,7 +564,6 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -607,6 +607,7 @@ spec: metadata: labels: app: webhook + annotations: spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go b/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go index 4d9ff65f54..c21e13618d 100644 --- a/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go +++ b/tests/cert-manager-cert-manager-overlays-letsencrypt_test.go @@ -516,6 +516,7 @@ spec: metadata: labels: app: cainjector + annotations: spec: serviceAccountName: cert-manager-cainjector containers: @@ -554,7 +555,6 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -598,6 +598,7 @@ spec: metadata: labels: app: webhook + annotations: spec: serviceAccountName: cert-manager-webhook containers: diff --git a/tests/cert-manager-cert-manager-overlays-self-signed_test.go b/tests/cert-manager-cert-manager-overlays-self-signed_test.go index 26bfc95ba7..e472e9d1c3 100644 --- a/tests/cert-manager-cert-manager-overlays-self-signed_test.go +++ b/tests/cert-manager-cert-manager-overlays-self-signed_test.go @@ -476,6 +476,7 @@ spec: metadata: labels: app: cainjector + annotations: spec: serviceAccountName: cert-manager-cainjector containers: @@ -514,7 +515,6 @@ spec: prometheus.io/path: "/metrics" prometheus.io/scrape: 'true' prometheus.io/port: '9402' - sidecar.istio.io/inject: "false" spec: serviceAccountName: cert-manager containers: @@ -558,6 +558,7 @@ spec: metadata: labels: app: webhook + annotations: spec: serviceAccountName: cert-manager-webhook containers: