Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

Update #32

Open
wants to merge 72 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
237dd89
Create exampledeployment.yaml
djh82uk May 17, 2021
17d1f6f
added deployment
djh82uk May 17, 2021
809ff10
Created deployment.yaml
darren-johnson May 17, 2021
e0b291f
Merge pull request #2 from djh82uk/djh
djh82uk May 17, 2021
ae6d580
Merge pull request #1 from darren-johnson/patch-1
djh82uk May 17, 2021
6ddedf5
Added another deployment
djh82uk May 17, 2021
fa12293
Merge pull request #3 from djh82uk/djh
djh82uk May 17, 2021
c0410cd
Create deployment.yaml
thedevopscat May 17, 2021
59a96a2
Create deployment.yaml
pvghms May 17, 2021
16a6f88
Merge branch 'master' of https://github.com/pvghms/openhack-containers
pvghms May 17, 2021
2cb0b63
Merge pull request #5 from pvghms/master
djh82uk May 17, 2021
18b482b
Merge pull request #4 from thedevopscat/doc
djh82uk May 17, 2021
0025006
Update deployment.yaml
pvghms May 17, 2021
181200a
Merge pull request #6 from pvghms/patch-1
djh82uk May 17, 2021
4c7ac0c
Create service.yaml
djh82uk May 18, 2021
b18263a
Update service.yaml
djh82uk May 18, 2021
6780342
Created service.yaml
darren-johnson May 18, 2021
d68c893
Create service.yaml
pvghms May 18, 2021
e29fd06
Merge pull request #8 from pvghms/patch-2
djh82uk May 18, 2021
10de6f9
Merge pull request #7 from darren-johnson/master
djh82uk May 18, 2021
f525360
poi
thedevopscat May 18, 2021
c9c24f6
Merge pull request #9 from djh82uk/dk/poi
thedevopscat May 18, 2021
aabcb97
Created service.yaml
darren-johnson May 18, 2021
aaec9f8
Merge pull request #10 from darren-johnson/master
djh82uk May 18, 2021
9aee797
Updated deployment.yaml
darren-johnson May 18, 2021
118021d
Merge pull request #11 from darren-johnson/master
djh82uk May 18, 2021
757adb7
Update deployment.yaml
darren-johnson May 18, 2021
aec0feb
Update deployment.yaml
darren-johnson May 18, 2021
7487d92
Merge pull request #12 from darren-johnson/master
djh82uk May 18, 2021
4155fbf
Update deployment.yaml
djh82uk May 18, 2021
defe3da
Update deployment.yaml
djh82uk May 18, 2021
f7078b8
Update deployment.yaml
djh82uk May 18, 2021
42b1124
Create SecretProvider.yaml
djh82uk May 18, 2021
5faff64
Update deployment.yaml
djh82uk May 18, 2021
7c7abd7
Update deployment.yaml
djh82uk May 18, 2021
8945070
Update deployment.yaml
djh82uk May 18, 2021
fbc21cb
Update deployment.yaml
djh82uk May 18, 2021
df932b5
Update deployment.yaml
djh82uk May 18, 2021
e38c745
Update deployment.yaml
djh82uk May 18, 2021
b23613a
Update deployment.yaml
djh82uk May 18, 2021
db5b001
Update deployment.yaml
djh82uk May 19, 2021
b98e47b
Update SecretProvider.yaml
djh82uk May 19, 2021
1d3e5c8
Update deployment.yaml
pvghms May 19, 2021
64d190d
adding secrets
thedevopscat May 19, 2021
c323085
Merge pull request #13 from pvghms/patch-3
djh82uk May 19, 2021
aea45bf
Update deployment.yaml
darren-johnson May 19, 2021
a499104
Update deployment.yaml
pvghms May 19, 2021
c741eca
Merge pull request #14 from pvghms/patch-4
djh82uk May 19, 2021
2dd93c3
format yaml
thedevopscat May 19, 2021
20fcd0b
Merge branch 'master' of https://github.com/djh82uk/openhack-containers
thedevopscat May 19, 2021
52a29f1
Update service.yaml
djh82uk May 19, 2021
9ab7b31
updated namespace
thedevopscat May 19, 2021
86332f7
Merge branch 'master' of https://github.com/djh82uk/openhack-containers
thedevopscat May 19, 2021
144d600
Update service.yaml
pvghms May 19, 2021
3dae4de
Update service.yaml
darren-johnson May 19, 2021
7eb86a4
Merge pull request #15 from pvghms/patch-5
djh82uk May 19, 2021
3fed947
Create service.yaml
darren-johnson May 19, 2021
c6102b0
Merge pull request #16 from darren-johnson/master
djh82uk May 19, 2021
dff7e5e
Update service.yaml
pvghms May 19, 2021
f674009
Merge pull request #17 from pvghms/patch-6
djh82uk May 19, 2021
ed5da0a
Update deployment.yaml
pvghms May 19, 2021
7c82b8d
Merge pull request #18 from pvghms/patch-7
djh82uk May 19, 2021
5c49da3
ingress yaml
thedevopscat May 19, 2021
0c6459f
updated ingress
thedevopscat May 19, 2021
9ce0b0c
Create insurance.yaml
darren-johnson May 19, 2021
21bfa55
Update insurance.yaml
djh82uk May 19, 2021
376129f
Update insurance.yaml
djh82uk May 19, 2021
f4d493e
Update insurance.yaml
djh82uk May 19, 2021
8558537
Update insurance.yaml
djh82uk May 19, 2021
3baebf7
Update insurance.yaml
djh82uk May 19, 2021
de19466
Update insurance.yaml
djh82uk May 19, 2021
57ae85a
Update insurance.yaml
djh82uk May 19, 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
35 changes: 35 additions & 0 deletions SecretProvider.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
apiVersion: secrets-store.csi.x-k8s.io/v1alpha1
kind: SecretProviderClass
metadata:
name: azure-kvname
namespace: api
spec:
provider: azure
parameters:
usePodIdentity: "false"
useVMManagedIdentity: "true"
userAssignedIdentityID: "4293cc82-3323-41cb-bf31-9f4c7372238a"
keyvaultName: "aks2-kv"
objects: |
array:
- |
objectName: SQL-DBNAME
objectAlias: SQL_DBNAME
objectType: secret
objectVersion: ""
- |
objectName: SQL-FQDN
objectAlias: SQL_SERVER
objectType: secret
objectVersion: ""
- |
objectName: SQL-PASSWORD
objectAlias: SQL_PASSWORD
objectType: secret
objectVersion: ""
- |
objectName: SQL-USER
objectAlias: SQL_USER
objectType: secret
objectVersion: ""
tenantId: "TENANT"
38 changes: 38 additions & 0 deletions exampledeployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: user-java
name: user-java
namespace: openhack
spec:
replicas: 2
selector:
matchLabels:
app: user-java
template:
metadata:
labels:
app: user-java
spec:
containers:
- image: registryrfq6839.azurecr.io/user-java:v1.0
imagePullPolicy: Always
name: user-java
ports:
- containerPort: 80
env:
- name: SQL_SERVER
value: "sqlserverrfq6839.database.windows.net"
- name: SQL_DBNAME
value: "mydrivingDB"
- name: SQL_USER
valueFrom:
secretKeyRef:
name: sqlauth
key: username
- name: SQL_PASSWORD
valueFrom:
secretKeyRef:
name: sqlauth
key: password
41 changes: 41 additions & 0 deletions ingress-api.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: nginx-ingress
namespace: api
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/ssl-redirect: "false"
nginx.ingress.kubernetes.io/use-regex: "true"
spec:
rules:
- http:
paths:
- path: /api/poi(/|$)(.*)
pathType: Prefix
backend:
service:
name: poi
port:
number: 80
- path: /api/trips(/|$)(.*)
pathType: Prefix
backend:
service:
name: trips
port:
number: 80
- path: /api/user(/|$)(.*)
pathType: Prefix
backend:
service:
name: userprofile
port:
number: 80
- path: /api/user-java(/|$)(.*)
pathType: Prefix
backend:
service:
name: user-java
port:
number: 80
21 changes: 21 additions & 0 deletions ingress-web.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: web-ingress
namespace: web
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/ssl-redirect: "false"
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$1
spec:
rules:
- http:
paths:
- path: /(.*)
pathType: Prefix
backend:
service:
name: tripviewer
port:
number: 80
45 changes: 45 additions & 0 deletions src/insurance.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: insurance-deployment
labels:
deploy: insurance
spec:
replicas: 1
selector:
matchLabels:
app: insurance
template:
metadata:
labels:
app: insurance
spec:
containers:
- image: "registryrfq6839.azurecr.io/insurance:1.0"
resources:
requests:
memory: "512Mi"
cpu: "100m"
limits:
memory: "6.5Gi"
cpu: "1800m"
imagePullPolicy: Always
name: insurance
ports:
- containerPort: 8081
name: http
protocol: TCP
---
apiVersion: v1
kind: Service
metadata:
name: insurance
spec:
type: ClusterIP
selector:
app: insurance
ports:
- protocol: TCP
name: insurance-http
port: 80
targetPort: 8081
34 changes: 34 additions & 0 deletions src/poi/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: poi
name: poi
namespace: api
spec:
replicas: 2
selector:
matchLabels:
app: poi
template:
metadata:
labels:
app: poi
spec:
containers:
- image: registryrfq6839.azurecr.io/poi:v1.0
imagePullPolicy: Always
name: poi
ports:
- containerPort: 80
volumeMounts:
- name: secrets-store-inline
mountPath: "/secrets"
readOnly: true
volumes:
- name: secrets-store-inline
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "azure-kvname"
10 changes: 10 additions & 0 deletions src/poi/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: poi
namespace: api
spec:
ports:
- port: 80
selector:
app: poi
34 changes: 34 additions & 0 deletions src/trips/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: trips
name: trips
namespace: api
spec:
replicas: 2
selector:
matchLabels:
app: trips
template:
metadata:
labels:
app: trips
spec:
containers:
- image: registryrfq6839.azurecr.io/trips:chris
imagePullPolicy: Always
name: trips
ports:
- containerPort: 80
volumeMounts:
- name: secrets-store-inline
mountPath: "/secrets"
readOnly: true
volumes:
- name: secrets-store-inline
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "azure-kvname"
10 changes: 10 additions & 0 deletions src/trips/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: trips
namespace: api
spec:
ports:
- port: 80
selector:
app: trips
33 changes: 33 additions & 0 deletions src/tripviewer/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: tripviewer-deployment
labels:
app: tripviewer
namespace: web
spec:
replicas: 2
selector:
matchLabels:
app: tripviewer
template:
metadata:
labels:
app: tripviewer
spec:
containers:
- image: registryrfq6839.azurecr.io/tripviewer:v1.0
imagePullPolicy: Always
name: tripviewer
ports:
- containerPort: 80
env:
- name: TRIPS_API_ENDPOINT
value: "http://trips.api"
- name: USERPROFILE_API_ENDPOINT
value: "http://userprofile.api"
- name: ASPNETCORE_ENVIRONMENT
value: "Development"



10 changes: 10 additions & 0 deletions src/tripviewer/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: tripviewer
namespace: web
spec:
ports:
- port: 80
selector:
app: tripviewer
34 changes: 34 additions & 0 deletions src/user-java/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: user-java
name: user-java
namespace: api
spec:
replicas: 2
selector:
matchLabels:
app: user-java
template:
metadata:
labels:
app: user-java
spec:
containers:
- image: registryrfq6839.azurecr.io/user-java:v1.0
imagePullPolicy: Always
name: user-java
ports:
- containerPort: 80
volumeMounts:
- name: secrets-store-inline
mountPath: "/secrets"
readOnly: true
volumes:
- name: secrets-store-inline
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "azure-kvname"
10 changes: 10 additions & 0 deletions src/user-java/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: user-java
namespace: api
spec:
ports:
- port: 80
selector:
app: user-java
Loading