From a800718c75f2b290d7bc09298095b3db6164ca9e Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 16 Mar 2023 20:22:10 +0000 Subject: [PATCH] added annotations --- bin/dryrun-app.sh | 4 +++- k8s/infra/ingresses/templates/_helpers/ingress.yaml | 5 +++++ .../ingresses/templates/middleware-nextcloud.yaml | 11 +++++++++++ k8s/infra/ingresses/values.yaml | 2 ++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 k8s/infra/ingresses/templates/middleware-nextcloud.yaml diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index f8cbd00..757b77e 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -23,4 +23,6 @@ helm template $app $full_path --namespace $app \ --values $argocd_values_deployment_path \ --values $full_path/values.yaml \ --values $full_path/values-$deployment.yaml \ - > $tmp_path \ No newline at end of file + > $tmp_path + +echo $tmp_path \ No newline at end of file diff --git a/k8s/infra/ingresses/templates/_helpers/ingress.yaml b/k8s/infra/ingresses/templates/_helpers/ingress.yaml index ff0e051..b906b1e 100644 --- a/k8s/infra/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/infra/ingresses/templates/_helpers/ingress.yaml @@ -33,6 +33,11 @@ kind: Ingress metadata: name: "{{.prefix}}.{{.global.domain}}" namespace: {{ .namespace }} + annotations: + homelab-ingress/managing-app-namespace: "ingresses" + {{ range $k, $v := (.annotations | default (dict )) }} + {{ $k }}: {{ $v }} + {{ end }} spec: rules: - host: "{{.prefix}}.{{.global.domain}}" diff --git a/k8s/infra/ingresses/templates/middleware-nextcloud.yaml b/k8s/infra/ingresses/templates/middleware-nextcloud.yaml new file mode 100644 index 0000000..653c8dc --- /dev/null +++ b/k8s/infra/ingresses/templates/middleware-nextcloud.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: nextcloud + namespace: app-nextcloud +spec: + redirectRegex: + permanent: true + regex: "https://(.*)/.well-known/(?:card|cal)dav" + replacement: "https://${1}/remote.php/dav" diff --git a/k8s/infra/ingresses/values.yaml b/k8s/infra/ingresses/values.yaml index 6a885be..dab36d4 100644 --- a/k8s/infra/ingresses/values.yaml +++ b/k8s/infra/ingresses/values.yaml @@ -7,6 +7,8 @@ services: service: "nextcloud" namespace: "app-nextcloud" port: 8080 + annotations: + traefik.ingress.kubernetes.io/router.middlewares: app-nextcloud-nextcloud@kubernetescrd global: {} acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" skipTLSVerify: "false"