Commit 4d9abc6f authored by Björn Bartels's avatar Björn Bartels

Merge branch 'master' into 'release'

Master

See merge request !6
parents a27f015f 6dab9577
.DS_*
.project
.buildpath
......@@ -14,3 +14,4 @@ x/
src/assets/fonts
src/assets/img
src/assets/vendor
generated
\ No newline at end of file
This diff is collapsed.
# k8s-Demo
# k8s-Demo - demo application
- (javascript) demo application
\ No newline at end of file
......@@ -2,7 +2,7 @@ apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
kind: Deployment
metadata:
name: k8s-demo-app
namespace: k8s-demo-dev
namespace: k8s-demo
labels:
team: k8s-demo-dev
stage: dev
......@@ -24,7 +24,14 @@ spec:
image: harbor.bjoernbartels.earth:8013/k8s-demo/k8s-demo-app:DOCKER_TAG
ports:
- containerPort: 8080
readinessProbe:
resources:
requests:
memory: "100Mi"
cpu: "100m"
limits:
memory: "100Mi"
cpu: "100m"
readinessProbe:
httpGet:
path: /
port: 8080
......
......@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: k8s-demo-app
#annotations:
# kubernetes.io/ingress.class: "nginx"
# nginx.ingress.kubernetes.io/upstream-vhost: "$host"
namespace: k8s-demo-dev
annotations:
url: "https://k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev"
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-cf-production
namespace: k8s-demo
labels:
team: k8s-demo-dev
stage: dev
spec:
tls:
- hosts:
- k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev
secretName: k8s-demo-HOSTNAME_SUFFIX-letsencrypt-certificate
rules:
- host: k8s-demo-HOSTNAME_SUFFIX.dev.k8s.bjoernbartels.earth
- host: k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev
http:
paths:
- path: /
backend:
serviceName: k8s-demo-app
servicePort: 8080
---
apiVersion: cert-manager.io/v1alpha2
kind: Certificate
metadata:
name: k8s-demo-HOSTNAME_SUFFIX-letsencrypt-certificate
namespace: k8s-demo
spec:
secretName: k8s-demo-HOSTNAME_SUFFIX-letsencrypt-certificate
duration: 2160h # 90d
renewBefore: 360h # 15d
commonName: k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev
dnsNames:
- k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev
#uriSANs:
#- spiffe://cluster.local/ns/sandbox/sa/example
issuerRef:
name: letsencrypt-cf-production
kind: ClusterIssuer
......@@ -11,7 +11,7 @@ metadata:
stage: dev
spec:
rules:
- host: k8s-demo-dev.dev.k8s.bjoernbartels.earth
- host: k8s-demo-dev.k8s.bjoernbartels.dev
http:
paths:
- path: /
......
......@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: k8s-demo-app
namespace: k8s-demo-dev
namespace: k8s-demo
labels:
team: k8s-demo-dev
stage: dev
......
......@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: k8s-demo-app
#annotations:
# kubernetes.io/ingress.class: "nginx"
# nginx.ingress.kubernetes.io/upstream-vhost: "$host"
namespace: k8s-demo-prod
annotations:
url: "https://k8s-demo.bjoernbartels.dev"
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-cf-production
namespace: k8s-demo
labels:
team: k8s-demo-dev
stage: production
team: k8s-demo-prod
stage: dev
spec:
tls:
- hosts:
- k8s-demo.bjoernbartels.dev
secretName: k8s-demo-letsencrypt-certificate
rules:
- host: k8s-demo.k8s.bjoernbartels.earth
- host: k8s-demo.bjoernbartels.dev
http:
paths:
- path: /
backend:
serviceName: k8s-demo-app
servicePort: 8080
---
apiVersion: cert-manager.io/v1alpha2
kind: Certificate
metadata:
name: k8s-demo-letsencrypt-certificate
namespace: k8s-demo
spec:
secretName: k8s-demo-letsencrypt-certificate
duration: 2160h # 90d
renewBefore: 360h # 15d
commonName: k8s-demo.bjoernbartels.dev
dnsNames:
- k8s-demo.bjoernbartels.dev
#uriSANs:
#- spiffe://cluster.local/ns/sandbox/sa/example
issuerRef:
name: letsencrypt-cf-production
kind: ClusterIssuer
......@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: k8s-demo-app
#annotations:
# kubernetes.io/ingress.class: "nginx"
# nginx.ingress.kubernetes.io/upstream-vhost: "$host"
namespace: k8s-demo-staging
annotations:
url: "https://k8s-demo-staging.bjoernbartels.dev"
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-cf-production
namespace: k8s-demo
labels:
team: k8s-demo-dev
stage: staging
stage: dev
spec:
tls:
- hosts:
- k8s-demo-staging.bjoernbartels.dev
secretName: k8s-demo-staging-letsencrypt-certificate
rules:
- host: k8s-demo-test.test.k8s.bjoernbartels.earth
- host: k8s-demo-staging.bjoernbartels.dev
http:
paths:
- path: /
backend:
serviceName: k8s-demo-app
servicePort: 8080
---
apiVersion: cert-manager.io/v1alpha2
kind: Certificate
metadata:
name: k8s-demo-staging-letsencrypt-certificate
namespace: k8s-demo
spec:
secretName: k8s-demo-staging-letsencrypt-certificate
duration: 2160h # 90d
renewBefore: 360h # 15d
commonName: k8s-demo-staging.bjoernbartels.dev
dnsNames:
- k8s-demo-staging.bjoernbartels.dev
#uriSANs:
#- spiffe://cluster.local/ns/sandbox/sa/example
issuerRef:
name: letsencrypt-cf-production
kind: ClusterIssuer
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment