diff --git a/Makefile b/Makefile index f78bc58..89dc05f 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,14 @@ dev: static: hugo container: - podman build -t docker.io/jmbitci/www-jmbfountain-de . + podman build -t docker.io/jmbitci/www-jmbit-de . publish: - podman push docker.io/jmbitci/www-jmbfountain-de + podman push docker.io/jmbitci/www-jmbit-de nopub: static container - podman run --rm docker.io/jmbitci/www-jmbfountain-de + podman run --rm docker.io/jmbitci/www-jmbit-de + +rollout: + kubectl rollout restart deployment www-jmbit-de -n jmbit-web all: static container publish diff --git a/config.toml b/config.toml index 0cdf592..0040ae9 100644 --- a/config.toml +++ b/config.toml @@ -7,8 +7,8 @@ paginate = 5 contentTypeName = "posts" themeColor = "blue" showMenuItems = 5 - fullWidthTheme = true - centerTheme = false + fullWidthTheme = false + centerTheme = true [languages] [languages.de] diff --git a/deployment.yml b/deployment.yml index 2d8da65..fc32cfd 100644 --- a/deployment.yml +++ b/deployment.yml @@ -7,7 +7,7 @@ metadata: labels: app: nginx-jmbit-www spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: nginx-jmbit-www @@ -19,6 +19,7 @@ spec: containers: - name: www-jmbit-de image: docker.io/jmbitci/www-jmbit-de + imagePullPolicy: "Always" ports: - containerPort: 80 --- @@ -34,73 +35,4 @@ spec: name: tcp selector: app: nginx-jmbit-www ---- -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: letsencrypt-web-staging - namespace: jmbit-web -spec: - acme: - email: webmaster@jmbit.de # replace this - privateKeySecretRef: - name: letsencrypt-web-staging - server: https://acme-staging-v02.api.letsencrypt.org/directory - solvers: - - http01: - ingress: - class: traefik ---- -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: letsencrypt-web-prod - namespace: jmbit-web -spec: - acme: - email: webmaster@jmbit.de # replace this - privateKeySecretRef: - name: letsencrypt-web-prod - server: https://acme-v02.api.letsencrypt.org/directory - solvers: - - http01: - ingress: - class: traefik - ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: jmbit-web-ingress - namespace: jmbit-web - annotations: - kubernetes.io/ingress.class: "traefik" - cert-manager.io/issuer: letsencrypt-web-prod -spec: - tls: - - secretName: jmbit-web-cert-prod - hosts: - - www.jmbit.de - - jmbit.de - rules: - - host: www.jmbit.de - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: www-jmbit-de-service - port: - number: 80 - - host: jmbit.de - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: www-jmbit-de-service - port: - number: 80 diff --git a/ingress-traefik.yml b/ingress-traefik.yml new file mode 100644 index 0000000..170db7a --- /dev/null +++ b/ingress-traefik.yml @@ -0,0 +1,39 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: jmbit-web-ingress + namespace: jmbit-web + annotations: + kubernetes.io/ingress.class: "traefik" + cert-manager.io/issuer: letsencrypt-web + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" +spec: + tls: + - secretName: jmbit-web-cert + hosts: + - www.jmbit.de + - jmbit.de + rules: + - host: www.jmbit.de + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: www-jmbit-de-service + port: + number: 80 + - host: jmbit.de + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: www-jmbit-de-service + port: + number: 80 +