1 Commits

Author SHA1 Message Date
ducoterra
31aef36ffd Upgrade to nginx ingress
Use new nginx ingress. Don't use .gitlab-ci for now until vault
integration makes sense.
2021-05-20 15:00:17 -04:00
3 changed files with 61 additions and 77 deletions

View File

@@ -1,34 +1,34 @@
variables:
CI_PROJECT_DIR: "."
CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/python-docs-2020
DEPLOY: pythondocs2020
# variables:
# CI_PROJECT_DIR: "."
# CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/python-docs-2020
# DEPLOY: pythondocs2020
stages:
- build
- deploy
# stages:
# - build
# - deploy
build:
only:
variables:
- $CI_COMMIT_TAG
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
# build:
# only:
# variables:
# - $CI_COMMIT_TAG
# stage: build
# image:
# name: gcr.io/kaniko-project/executor:debug
# entrypoint: [""]
# script:
# - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
deploy:
stage: deploy
only:
variables:
- $CI_COMMIT_TAG
image:
name: debian:10
entrypoint: [""]
script:
- apt -qq update >> /dev/null && apt -qq install -y curl gettext >> /dev/null
- curl -o /usr/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
- chmod +x /usr/bin/kubectl
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
- helm upgrade --install $DEPLOY ./helm --set image=$CI_REGISTRY_IMAGE --set tag=$CI_COMMIT_TAG
# deploy:
# stage: deploy
# only:
# variables:
# - $CI_COMMIT_TAG
# image:
# name: debian:10
# entrypoint: [""]
# script:
# - apt -qq update >> /dev/null && apt -qq install -y curl gettext >> /dev/null
# - curl -o /usr/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
# - chmod +x /usr/bin/kubectl
# - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
# - helm upgrade --install $DEPLOY ./helm --set image=$CI_REGISTRY_IMAGE --set tag=$CI_COMMIT_TAG

View File

@@ -1,53 +1,36 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Release.Name }}-tls
annotations:
kubernetes.io/ingress.class: traefik
spec:
entryPoints:
- websecure
tls:
certResolver: duconet
routes:
- match: Host(`{{ .Release.Name }}.ducoterra.net`)
kind: Rule
services:
- name: {{ .Release.Name }}
port: {{ .Values.port }}
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
cert-manager.io/cluster-issuer: letsencrypt-prod
kubernetes.io/ingress.class: nginx
name: {{ .Release.Name }}
annotations:
kubernetes.io/ingress.class: traefik
spec:
entryPoints:
- web
routes:
- match: Host(`{{ .Release.Name }}.ducoterra.net`)
kind: Rule
services:
- name: {{ .Release.Name }}
port: {{ .Values.port }}
middlewares:
- name: httpsredirect-{{ .Release.Name }}
rules:
- host: {{ .Release.Name }}.ducoterra.net
http:
paths:
- backend:
service:
name: {{ .Release.Name }}
port:
number: {{ .Values.port }}
path: /
pathType: Prefix
tls:
- hosts:
- {{ .Release.Name }}.ducoterra.net
secretName: {{.Release.Name}}-tls-cert
---
apiVersion: traefik.containo.us/v1alpha1
kind: Middleware
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: httpsredirect-{{ .Release.Name }}
name: {{.Release.Name}}.ducoterra.net
spec:
redirectScheme:
scheme: https
permanent: true
---
apiVersion: traefik.containo.us/v1alpha1
kind: Middleware
metadata:
name: basic-auth-{{ .Release.Name }}
spec:
basicAuth:
secret: authsecret
removeHeader: true
secretName: {{.Release.Name}}-tls-cert
issuerRef:
name: letsencrypt-prod
kind: ClusterIssuer
commonName: {{.Release.Name}}.ducoterra.net
dnsNames:
- {{.Release.Name}}.ducoterra.net

1
setenv.sh Executable file
View File

@@ -0,0 +1 @@
kubectl config set current-context k3os-alpha.dnet-ducoterra-websites