From 24ded415ec81b2dfb27ccab5b776c275d5b3422b Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Sat, 26 Feb 2022 00:45:40 +0100 Subject: [PATCH] Rename traefik_domain var to cluster_domain --- tasks/main.yml | 4 ++-- templates/drone-helm-value.yaml.j2 | 10 +++++----- templates/gitea/gitea-IngressRoute.yml.j2 | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index ef8c605..fd410c2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -109,7 +109,7 @@ # annotations: {} # # kubernetes.io/ingress.class: traefik # hosts: -# - host: trivy.{{ traefik_domain }} +# - host: trivy.{{ cluster_domain }} tags: - trivy @@ -162,7 +162,7 @@ annotations: {} labels: {} hosts[0]: - name: chartmuseum.{{ traefik_domain }} + name: chartmuseum.{{ cluster_domain }} tags: - chartmuseum diff --git a/templates/drone-helm-value.yaml.j2 b/templates/drone-helm-value.yaml.j2 index 9e9ed4f..8039358 100644 --- a/templates/drone-helm-value.yaml.j2 +++ b/templates/drone-helm-value.yaml.j2 @@ -51,13 +51,13 @@ ingress: traefik.ingress.kubernetes.io/router.entrypoints: web,websecure traefik.ingress.kubernetes.io/router.middlewares: security_headers@file hosts: - - host: drone.{{ traefik_domain }} + - host: drone.{{ cluster_domain }} paths: - "/" tls: - - secretName: drone.{{ traefik_domain }} + - secretName: drone.{{ cluster_domain }} hosts: - - drone.{{ traefik_domain }} + - drone.{{ cluster_domain }} resources: limits: @@ -168,7 +168,7 @@ env: ## REQUIRED: Set the user-visible Drone hostname, sans protocol. ## Ref: https://docs.drone.io/installation/reference/drone-server-host/ ## - DRONE_SERVER_HOST: "drone.{{ traefik_domain }}" + DRONE_SERVER_HOST: "drone.{{ cluster_domain }}" ## The protocol to pair with the value in DRONE_SERVER_HOST (http or https). ## Ref: https://docs.drone.io/installation/reference/drone-server-proto/ ## @@ -242,7 +242,7 @@ env: ## DRONE_GITEA_CLIENT_ID: "{{ drone_gitea_client_id }}" DRONE_GITEA_CLIENT_SECRET: "{{ drone_gitea_client_secret }}" - DRONE_GITEA_SERVER: "https://gitea.{{ traefik_domain }}" + DRONE_GITEA_SERVER: "https://gitea.{{ cluster_domain }}" ## Gogs-specific variables. See the provider docs here: ## Ref: https://docs.drone.io/installation/providers/gogs/ diff --git a/templates/gitea/gitea-IngressRoute.yml.j2 b/templates/gitea/gitea-IngressRoute.yml.j2 index 0a1ecef..3b9898e 100644 --- a/templates/gitea/gitea-IngressRoute.yml.j2 +++ b/templates/gitea/gitea-IngressRoute.yml.j2 @@ -17,7 +17,7 @@ spec: # Match is the rule corresponding to an underlying router. # Later on, match could be the simple form of a path prefix, e.g. just "/bar", # but for now we only support a traefik style matching rule. - - match: Host(`gitea.{{ traefik_domain }}`) + - match: Host(`gitea.{{ cluster_domain }}`) # kind could eventually be one of "Rule", "Path", "Host", "Method", "Header", # "Parameter", etc, to support simpler forms of rule matching, but for now we # only support "Rule".