From 9f83240ef11d7543f6de4d51aac2e6126b1a9c55 Mon Sep 17 00:00:00 2001 From: Vargha Csongor Date: Sun, 3 Mar 2024 21:35:45 +0100 Subject: [PATCH] fix traefik values.yml --- oci-managed/main.tf | 2 +- oci-managed/nlb/variables.tf | 2 +- oci-managed/oke/data.tf | 2 +- oci-managed/oke/output.tf | 2 +- oci-managed/traefik-values.yml | 19 ++++++++++++------- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/oci-managed/main.tf b/oci-managed/main.tf index 4aaa24d..c5e5fee 100644 --- a/oci-managed/main.tf +++ b/oci-managed/main.tf @@ -51,7 +51,7 @@ module "nlb" { compartment_ocid = var.compartment_ocid cluster_ocid = module.oke.cluster_ocid - values_file = "traefik-values.yaml" + values_file = "traefik-values.yml" depends_on = [ module.oke ] } diff --git a/oci-managed/nlb/variables.tf b/oci-managed/nlb/variables.tf index e73129a..5489f97 100644 --- a/oci-managed/nlb/variables.tf +++ b/oci-managed/nlb/variables.tf @@ -34,5 +34,5 @@ variable "replica_count" { variable "values_file" { description = "The name of the traefik helmchart values file to use" type = string - default = "values.yaml" + default = "traefik-values.yml" } diff --git a/oci-managed/oke/data.tf b/oci-managed/oke/data.tf index 786d8d4..779f79d 100644 --- a/oci-managed/oke/data.tf +++ b/oci-managed/oke/data.tf @@ -23,4 +23,4 @@ data "oci_containerengine_cluster_kube_config" "cluster_kube_config" { resource "local_file" "oke_kubeconfig" { content = data.oci_containerengine_cluster_kube_config.cluster_kube_config.content filename = "${path.module}/kubeconfig" - } \ No newline at end of file + } diff --git a/oci-managed/oke/output.tf b/oci-managed/oke/output.tf index fa41171..8025cee 100644 --- a/oci-managed/oke/output.tf +++ b/oci-managed/oke/output.tf @@ -4,4 +4,4 @@ output "cluster_ocid" { output "public_endpoint" { value = one(oci_containerengine_cluster.k8s_cluster.endpoints) -} \ No newline at end of file +} diff --git a/oci-managed/traefik-values.yml b/oci-managed/traefik-values.yml index 105719f..0f6e66a 100644 --- a/oci-managed/traefik-values.yml +++ b/oci-managed/traefik-values.yml @@ -870,25 +870,30 @@ persistence: # -- Certificates resolvers configuration certResolvers: {} -# letsencrypt: +#letsencrypt: # # for challenge options cf. https://doc.traefik.io/traefik/https/acme/ -# email: email@example.com -# dnsChallenge: +# email: email@example.com +# dnsChallenge: # # also add the provider's required configuration under env # # or expand then from secrets/configmaps with envfrom # # cf. https://doc.traefik.io/traefik/https/acme/#providers -# provider: cloudflare +# provider: cloudflare # # add futher options for the dns challenge as needed # # cf. https://doc.traefik.io/traefik/https/acme/#dnschallenge # delayBeforeCheck: 30 # resolvers: # - 1.1.1.1 # - 8.8.8.8 -# tlsChallenge: true -# httpChallenge: +# tlsChallenge: true +# httpChallenge: # entryPoint: "web" # # It has to match the path with a persistent volume -# storage: /data/acme.json +# storage: /data/acme.json +# env: +# - name: CLOUDFLARE_EMAIL +# value: "" +# - name: CLOUDFLARE_API_KEY +# value: "" # -- If hostNetwork is true, runs traefik in the host network namespace # To prevent unschedulabel pods due to port collisions, if hostNetwork=true