Commit 6dab9577 authored by Björn Bartels's avatar Björn Bartels

Update .gitlab-ci.yml, config/kubernetes/hotfix/ingress.yaml,...

Update .gitlab-ci.yml, config/kubernetes/hotfix/ingress.yaml, config/kubernetes/staging/ingress.yaml, config/kubernetes/dev/ingress-feature.yaml files
parent a27f015f
.DS_*
.project .project
.buildpath .buildpath
...@@ -14,3 +14,4 @@ x/ ...@@ -14,3 +14,4 @@ x/
src/assets/fonts src/assets/fonts
src/assets/img src/assets/img
src/assets/vendor 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 ...@@ -2,7 +2,7 @@ apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
kind: Deployment kind: Deployment
metadata: metadata:
name: k8s-demo-app name: k8s-demo-app
namespace: k8s-demo-dev namespace: k8s-demo
labels: labels:
team: k8s-demo-dev team: k8s-demo-dev
stage: dev stage: dev
...@@ -24,7 +24,14 @@ spec: ...@@ -24,7 +24,14 @@ spec:
image: harbor.bjoernbartels.earth:8013/k8s-demo/k8s-demo-app:DOCKER_TAG image: harbor.bjoernbartels.earth:8013/k8s-demo/k8s-demo-app:DOCKER_TAG
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: resources:
requests:
memory: "100Mi"
cpu: "100m"
limits:
memory: "100Mi"
cpu: "100m"
readinessProbe:
httpGet: httpGet:
path: / path: /
port: 8080 port: 8080
......
...@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1 ...@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: k8s-demo-app name: k8s-demo-app
#annotations: annotations:
# kubernetes.io/ingress.class: "nginx" url: "https://k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev"
# nginx.ingress.kubernetes.io/upstream-vhost: "$host" kubernetes.io/ingress.class: "nginx"
namespace: k8s-demo-dev cert-manager.io/cluster-issuer: letsencrypt-cf-production
namespace: k8s-demo
labels: labels:
team: k8s-demo-dev team: k8s-demo-dev
stage: dev stage: dev
spec: spec:
tls:
- hosts:
- k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev
secretName: k8s-demo-HOSTNAME_SUFFIX-letsencrypt-certificate
rules: rules:
- host: k8s-demo-HOSTNAME_SUFFIX.dev.k8s.bjoernbartels.earth - host: k8s-demo-HOSTNAME_SUFFIX.bjoernbartels.dev
http: http:
paths: paths:
- path: / - path: /
backend: backend:
serviceName: k8s-demo-app serviceName: k8s-demo-app
servicePort: 8080 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: ...@@ -11,7 +11,7 @@ metadata:
stage: dev stage: dev
spec: spec:
rules: rules:
- host: k8s-demo-dev.dev.k8s.bjoernbartels.earth - host: k8s-demo-dev.k8s.bjoernbartels.dev
http: http:
paths: paths:
- path: / - path: /
......
...@@ -3,7 +3,7 @@ apiVersion: v1 ...@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: k8s-demo-app name: k8s-demo-app
namespace: k8s-demo-dev namespace: k8s-demo
labels: labels:
team: k8s-demo-dev team: k8s-demo-dev
stage: dev stage: dev
......
...@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1 ...@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: k8s-demo-app name: k8s-demo-app
#annotations: annotations:
# kubernetes.io/ingress.class: "nginx" url: "https://k8s-demo.bjoernbartels.dev"
# nginx.ingress.kubernetes.io/upstream-vhost: "$host" kubernetes.io/ingress.class: "nginx"
namespace: k8s-demo-prod cert-manager.io/cluster-issuer: letsencrypt-cf-production
namespace: k8s-demo
labels: labels:
team: k8s-demo-dev team: k8s-demo-prod
stage: production stage: dev
spec: spec:
tls:
- hosts:
- k8s-demo.bjoernbartels.dev
secretName: k8s-demo-letsencrypt-certificate
rules: rules:
- host: k8s-demo.k8s.bjoernbartels.earth - host: k8s-demo.bjoernbartels.dev
http: http:
paths: paths:
- path: / - path: /
backend: backend:
serviceName: k8s-demo-app serviceName: k8s-demo-app
servicePort: 8080 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 ...@@ -2,19 +2,44 @@ apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: k8s-demo-app name: k8s-demo-app
#annotations: annotations:
# kubernetes.io/ingress.class: "nginx" url: "https://k8s-demo-staging.bjoernbartels.dev"
# nginx.ingress.kubernetes.io/upstream-vhost: "$host" kubernetes.io/ingress.class: "nginx"
namespace: k8s-demo-staging cert-manager.io/cluster-issuer: letsencrypt-cf-production
namespace: k8s-demo
labels: labels:
team: k8s-demo-dev team: k8s-demo-dev
stage: staging stage: dev
spec: spec:
tls:
- hosts:
- k8s-demo-staging.bjoernbartels.dev
secretName: k8s-demo-staging-letsencrypt-certificate
rules: rules:
- host: k8s-demo-test.test.k8s.bjoernbartels.earth - host: k8s-demo-staging.bjoernbartels.dev
http: http:
paths: paths:
- path: / - path: /
backend: backend:
serviceName: k8s-demo-app serviceName: k8s-demo-app
servicePort: 8080 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