From d3a563e7702ca4a65086d90cb9096f64113e69ba Mon Sep 17 00:00:00 2001
From: Pablo Solar Vilariño <psolarvi@redhat.com>
Date: Thu, 04 Jun 2020 17:38:20 +0200
Subject: [PATCH] Updated shelter deployment to be Istio friendly
---
/dev/null | 145 ------------------------------------
adopt-a-pup/kubefiles/shelter-service.yaml | 69 +++++++++++++++++
2 files changed, 69 insertions(+), 145 deletions(-)
diff --git a/adopt-a-pup/kubefiles/shelter-service.yaml b/adopt-a-pup/kubefiles/shelter-service.yaml
new file mode 100644
index 0000000..e0592f0
--- /dev/null
+++ b/adopt-a-pup/kubefiles/shelter-service.yaml
@@ -0,0 +1,69 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: shelter-service
+spec:
+ selector:
+ matchLabels:
+ app: shelter-service
+ replicas: 1
+ template:
+ metadata:
+ labels:
+ app: shelter-service
+ annotations:
+ sidecar.istio.io/inject: "true"
+ spec:
+ containers:
+ - name: shelter-service
+ image: quay.io/psolarvi/ossm-shelter-service:1.0
+ ports:
+ - containerPort: 8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: shelter-service
+ name: shelter-service
+spec:
+ ports:
+ - port: 8080
+ protocol: TCP
+ targetPort: 8080
+ selector:
+ app: shelter-service
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: Gateway
+metadata:
+ name: shelter-service-gw
+spec:
+ selector:
+ istio: ingressgateway
+ servers:
+ - port:
+ number: 80
+ name: http
+ protocol: HTTP
+ hosts:
+ - "*"
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+ name: shelter-service-vs
+spec:
+ hosts:
+ - "*"
+ gateways:
+ - shelter-service-gw
+ http:
+ - match:
+ - uri:
+ prefix: /shelters
+ route:
+ - destination:
+ host: shelter-service
+ port:
+ number: 8080
diff --git a/adopt-a-pup/shelter-templates/shelter-bc.yaml b/adopt-a-pup/shelter-templates/shelter-bc.yaml
deleted file mode 100644
index 3926bde..0000000
--- a/adopt-a-pup/shelter-templates/shelter-bc.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-apiVersion: build.openshift.io/v1
-kind: BuildConfig
-metadata:
- build: shelter-service
- name: shelter-service
-spec:
- failedBuildsHistoryLimit: 5
- nodeSelector: null
- output:
- to:
- kind: ImageStreamTag
- name: shelter-service:latest
- postCommit: {}
- resources: {}
- runPolicy: Serial
- source:
- contextDir: adopt-a-pup/shelter-service
- git:
- uri: https://github.com/jonahkh/DO328-apps
- type: Git
- strategy:
- sourceStrategy:
- from:
- kind: ImageStreamTag
- name: java:latest
- namespace: openshift
- type: Source
- successfulBuildsHistoryLimit: 5
- triggers:
- - github:
- secret: J6DU2k5yEa8TF-sVwAzx
- type: GitHub
- - generic:
- secret: j3DkGGG5I7ziGp9ARvau
- type: Generic
- - type: ConfigChange
- - type: ImageChange
diff --git a/adopt-a-pup/shelter-templates/shelter-dc.yaml b/adopt-a-pup/shelter-templates/shelter-dc.yaml
deleted file mode 100644
index 2ec25db..0000000
--- a/adopt-a-pup/shelter-templates/shelter-dc.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
-metadata:
- annotations:
- openshift.io/generated-by: OpenShiftNewApp
- labels:
- app: shelter-service
- app.kubernetes.io/component: shelter-service
- app.kubernetes.io/instance: shelter-service
- name: shelter-service
-spec:
- replicas: 1
- revisionHistoryLimit: 10
- selector:
- deploymentconfig: shelter-service
- strategy:
- activeDeadlineSeconds: 21600
- resources: {}
- rollingParams:
- intervalSeconds: 1
- maxSurge: 25%
- maxUnavailable: 25%
- timeoutSeconds: 600
- updatePeriodSeconds: 1
- type: Rolling
- template:
- metadata:
- annotations:
- openshift.io/generated-by: OpenShiftNewApp
- creationTimestamp: null
- labels:
- deploymentconfig: shelter-service
- spec:
- containers:
- - imagePullPolicy: Always
- name: shelter-service
- ports:
- - containerPort: 8080
- protocol: TCP
- - containerPort: 8443
- protocol: TCP
- - containerPort: 8778
- protocol: TCP
- resources: {}
- terminationMessagePath: /dev/termination-log
- terminationMessagePolicy: File
- dnsPolicy: ClusterFirst
- restartPolicy: Always
- schedulerName: default-scheduler
- securityContext: {}
- terminationGracePeriodSeconds: 30
- test: false
- triggers:
- - type: ConfigChange
- - imageChangeParams:
- automatic: true
- containerNames:
- - shelter-service
- from:
- kind: ImageStreamTag
- name: shelter-service:latest
- namespace: adopt-a-pup
- type: ImageChange
diff --git a/adopt-a-pup/shelter-templates/shelter-is.yaml b/adopt-a-pup/shelter-templates/shelter-is.yaml
deleted file mode 100644
index 60e8004..0000000
--- a/adopt-a-pup/shelter-templates/shelter-is.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
- labels:
- build: shelter-service
- name: shelter-service
-spec:
- lookupPolicy:
- local: false
diff --git a/adopt-a-pup/shelter-templates/shelter-svc.yaml b/adopt-a-pup/shelter-templates/shelter-svc.yaml
deleted file mode 100644
index 79a6c61..0000000
--- a/adopt-a-pup/shelter-templates/shelter-svc.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- annotations:
- openshift.io/generated-by: OpenShiftNewApp
- labels:
- app: shelter-service
- app.kubernetes.io/component: shelter-service
- app.kubernetes.io/instance: shelter-service
- name: shelter-service
-spec:
- ports:
- - name: 8080-tcp
- port: 8080
- protocol: TCP
- targetPort: 8080
- - name: 8443-tcp
- port: 8443
- protocol: TCP
- targetPort: 8443
- - name: 8778-tcp
- port: 8778
- protocol: TCP
- targetPort: 8778
- selector:
- deploymentconfig: shelter-service
- sessionAffinity: None
- type: ClusterIP
diff --git a/adopt-a-pup/templates/shelter-service-template.yaml b/adopt-a-pup/templates/shelter-service-template.yaml
deleted file mode 100644
index 63c7bb7..0000000
--- a/adopt-a-pup/templates/shelter-service-template.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-apiVersion: template.openshift.io/v1
-kind: Template
-labels:
- template: shelter-service-template
-metadata:
- openshift.io/display-name: shelter-service
- openshift.io/provider-display-name: Red Hat, Inc.
- name: shelter-service
-objects:
- - apiVersion: image.openshift.io/v1
- kind: ImageStream
- metadata:
- labels:
- build: shelter-service
- name: shelter-service
- spec:
- lookupPolicy:
- local: false
- - apiVersion: build.openshift.io/v1
- kind: BuildConfig
- metadata:
- build: shelter-service
- name: shelter-service
- spec:
- failedBuildsHistoryLimit: 5
- nodeSelector: null
- output:
- to:
- kind: ImageStreamTag
- name: shelter-service:latest
- postCommit: {}
- resources: {}
- runPolicy: Serial
- source:
- contextDir: adopt-a-pup/shelter-service
- git:
- uri: https://github.com/jonahkh/DO328-apps
- type: Git
- strategy:
- sourceStrategy:
- from:
- kind: ImageStreamTag
- name: java:latest
- namespace: openshift
- type: Source
- successfulBuildsHistoryLimit: 5
- triggers:
- - github:
- secret: J6DU2k5yEa8TF-sVwAzx
- type: GitHub
- - generic:
- secret: j3DkGGG5I7ziGp9ARvau
- type: Generic
- - type: ConfigChange
- - type: ImageChange
- - apiVersion: apps.openshift.io/v1
- kind: DeploymentConfig
- metadata:
- annotations:
- openshift.io/generated-by: OpenShiftNewApp
- labels:
- app: shelter-service
- app.kubernetes.io/component: shelter-service
- app.kubernetes.io/instance: shelter-service
- name: shelter-service
- spec:
- replicas: 1
- revisionHistoryLimit: 10
- selector:
- deploymentconfig: shelter-service
- strategy:
- activeDeadlineSeconds: 21600
- resources: {}
- rollingParams:
- intervalSeconds: 1
- maxSurge: 25%
- maxUnavailable: 25%
- timeoutSeconds: 600
- updatePeriodSeconds: 1
- type: Rolling
- template:
- metadata:
- annotations:
- openshift.io/generated-by: OpenShiftNewApp
- creationTimestamp: null
- labels:
- deploymentconfig: shelter-service
- spec:
- containers:
- - imagePullPolicy: Always
- name: shelter-service
- ports:
- - containerPort: 8080
- protocol: TCP
- - containerPort: 8443
- protocol: TCP
- - containerPort: 8778
- protocol: TCP
- resources: {}
- terminationMessagePath: /dev/termination-log
- terminationMessagePolicy: File
- dnsPolicy: ClusterFirst
- restartPolicy: Always
- schedulerName: default-scheduler
- securityContext: {}
- terminationGracePeriodSeconds: 30
- test: false
- triggers:
- - type: ConfigChange
- - imageChangeParams:
- automatic: true
- containerNames:
- - shelter-service
- from:
- kind: ImageStreamTag
- name: shelter-service:latest
- type: ImageChange
- - apiVersion: v1
- kind: Service
- metadata:
- annotations:
- openshift.io/generated-by: OpenShiftNewApp
- labels:
- app: shelter-service
- app.kubernetes.io/component: shelter-service
- app.kubernetes.io/instance: shelter-service
- name: shelter-service
- spec:
- ports:
- - name: 8080-tcp
- port: 8080
- protocol: TCP
- targetPort: 8080
- - name: 8443-tcp
- port: 8443
- protocol: TCP
- targetPort: 8443
- - name: 8778-tcp
- port: 8778
- protocol: TCP
- targetPort: 8778
- selector:
- deploymentconfig: shelter-service
- sessionAffinity: None
- type: ClusterIP
--
Gitblit v1.9.3