From 0c84164b656025d4da0f3e4c3354e01e99bb2d31 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 20 Apr 2018 01:03:16 +0300 Subject: [PATCH] Add Istio ingress to v1alpha3, remove v1alpha2 --- .../ing.yaml} | 3 +- deploy/istio/canary-dep.yaml | 52 ------------------- deploy/istio/canary-routes.yaml | 21 -------- deploy/istio/canaryb-dep.yaml | 52 ------------------- deploy/istio/ga-dep.yaml | 52 ------------------- deploy/istio/ga-routes.yaml | 32 ------------ deploy/istio/podinfo-svc.yaml | 16 ------ 7 files changed, 2 insertions(+), 226 deletions(-) rename deploy/{istio/podinfo-ing.yaml => istio-v1alpha3/ing.yaml} (82%) delete mode 100644 deploy/istio/canary-dep.yaml delete mode 100644 deploy/istio/canary-routes.yaml delete mode 100644 deploy/istio/canaryb-dep.yaml delete mode 100644 deploy/istio/ga-dep.yaml delete mode 100644 deploy/istio/ga-routes.yaml delete mode 100644 deploy/istio/podinfo-svc.yaml diff --git a/deploy/istio/podinfo-ing.yaml b/deploy/istio-v1alpha3/ing.yaml similarity index 82% rename from deploy/istio/podinfo-ing.yaml rename to deploy/istio-v1alpha3/ing.yaml index ebc1cd2..4c0d84c 100644 --- a/deploy/istio/podinfo-ing.yaml +++ b/deploy/istio-v1alpha3/ing.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: podinfo + namespace: test annotations: kubernetes.io/ingress.class: istio spec: @@ -11,5 +12,5 @@ spec: paths: - path: /.* backend: - serviceName: podinfo + serviceName: podinfo.test servicePort: 9898 diff --git a/deploy/istio/canary-dep.yaml b/deploy/istio/canary-dep.yaml deleted file mode 100644 index a9dd500..0000000 --- a/deploy/istio/canary-dep.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -apiVersion: apps/v1beta2 -kind: Deployment -metadata: - name: podinfo-canary - labels: - app: podinfo - release: canary -spec: - replicas: 2 - selector: - matchLabels: - app: podinfo - release: canary - template: - metadata: - labels: - app: podinfo - release: canary - annotations: - prometheus.io/scrape: 'true' - spec: - containers: - - name: podinfod - image: quay.io/stefanprodan/podinfo:0.2.2 - imagePullPolicy: Always - command: - - ./podinfo - - -port=9898 - - -debug=true - ports: - - name: http - containerPort: 9898 - protocol: TCP - readinessProbe: - httpGet: - path: /readyz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 5 - failureThreshold: 1 - livenessProbe: - httpGet: - path: /healthz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 10 - failureThreshold: 2 - resources: - requests: - memory: "32Mi" - cpu: "10m" diff --git a/deploy/istio/canary-routes.yaml b/deploy/istio/canary-routes.yaml deleted file mode 100644 index 59e4558..0000000 --- a/deploy/istio/canary-routes.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: config.istio.io/v1alpha2 -kind: RouteRule -metadata: - name: podinfo-canary - namespace: default -spec: - precedence: 2 - match: - request: - headers: - x-user: - exact: insider - destination: - name: podinfo - route: - - labels: - release: canary - weight: 50 - - labels: - release: canaryb - weight: 50 diff --git a/deploy/istio/canaryb-dep.yaml b/deploy/istio/canaryb-dep.yaml deleted file mode 100644 index f6152d7..0000000 --- a/deploy/istio/canaryb-dep.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -apiVersion: apps/v1beta2 -kind: Deployment -metadata: - name: podinfo-canaryb - labels: - app: podinfo - release: canaryb -spec: - replicas: 2 - selector: - matchLabels: - app: podinfo - release: canaryb - template: - metadata: - labels: - app: podinfo - release: canaryb - annotations: - prometheus.io/scrape: 'true' - spec: - containers: - - name: podinfod - image: quay.io/stefanprodan/podinfo:0.2.0 - imagePullPolicy: Always - command: - - ./podinfo - - -port=9898 - - -debug=true - ports: - - name: http - containerPort: 9898 - protocol: TCP - readinessProbe: - httpGet: - path: /readyz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 5 - failureThreshold: 1 - livenessProbe: - httpGet: - path: /healthz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 10 - failureThreshold: 2 - resources: - requests: - memory: "32Mi" - cpu: "10m" diff --git a/deploy/istio/ga-dep.yaml b/deploy/istio/ga-dep.yaml deleted file mode 100644 index 2b2f984..0000000 --- a/deploy/istio/ga-dep.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -apiVersion: apps/v1beta2 -kind: Deployment -metadata: - name: podinfo-ga - labels: - app: podinfo - release: ga -spec: - replicas: 2 - selector: - matchLabels: - app: podinfo - release: ga - template: - metadata: - labels: - app: podinfo - release: ga - annotations: - prometheus.io/scrape: 'true' - spec: - containers: - - name: podinfod - image: quay.io/stefanprodan/podinfo:0.2.1 - imagePullPolicy: Always - command: - - ./podinfo - - -port=9898 - - -debug=true - ports: - - name: http - containerPort: 9898 - protocol: TCP - readinessProbe: - httpGet: - path: /readyz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 5 - failureThreshold: 1 - livenessProbe: - httpGet: - path: /healthz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 10 - failureThreshold: 2 - resources: - requests: - memory: "32Mi" - cpu: "10m" diff --git a/deploy/istio/ga-routes.yaml b/deploy/istio/ga-routes.yaml deleted file mode 100644 index 2aa5fc5..0000000 --- a/deploy/istio/ga-routes.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: config.istio.io/v1alpha2 -kind: RouteRule -metadata: - name: podinfo-ga - namespace: default -spec: - precedence: 1 - match: - request: - headers: - x-user: - regex: .* - destination: - name: podinfo - route: - - labels: - release: ga ---- -apiVersion: config.istio.io/v1alpha2 -kind: RouteRule -metadata: - name: podinfo-default - namespace: default -spec: - precedence: 0 - destination: - name: podinfo - route: - - labels: - release: ga - weight: 100 diff --git a/deploy/istio/podinfo-svc.yaml b/deploy/istio/podinfo-svc.yaml deleted file mode 100644 index 833dba0..0000000 --- a/deploy/istio/podinfo-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: podinfo - labels: - app: podinfo -spec: - type: NodePort - ports: - - name: http - port: 9898 - targetPort: http - protocol: TCP - selector: - app: podinfo