diff --git a/charts/fp/Chart.yaml b/charts/fp/Chart.yaml index ea9cf0a..98a136c 100644 --- a/charts/fp/Chart.yaml +++ b/charts/fp/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: fp description: The Galaxy's Best VTuber Hentai Site -version: 0.0.26 +version: 0.0.27 keywords: - fp - futureporn diff --git a/charts/fp/templates/cert-manager.yaml b/charts/fp/templates/cert-manager.yaml index bac8664..bcf4166 100644 --- a/charts/fp/templates/cert-manager.yaml +++ b/charts/fp/templates/cert-manager.yaml @@ -96,7 +96,6 @@ spec: apiSecretRef: name: exoscale key: apiSecret - {{ end }} {{ if eq .Values.environment "production" }} @@ -107,7 +106,6 @@ metadata: name: letsencrypt-prod spec: acme: - # server: https://acme-staging-v02.api.letsencrypt.org/directory server: https://acme-v02.api.letsencrypt.org/directory email: {{ .Values.adminEmail }} privateKeySecretRef: diff --git a/clusters/staging/infrastructure.yaml b/clusters/staging/infrastructure.yaml index 8a93f7a..4f43796 100644 --- a/clusters/staging/infrastructure.yaml +++ b/clusters/staging/infrastructure.yaml @@ -15,42 +15,42 @@ spec: prune: true wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: infra-configs - namespace: flux-system -spec: - dependsOn: - - name: infra-controllers - interval: 1h - retryInterval: 1m - timeout: 5m - sourceRef: - kind: GitRepository - name: flux-system - path: ./infrastructure/configs - prune: true - patches: - - patch: | - - op: replace - path: /spec/acme/server - value: https://acme-staging-v02.api.letsencrypt.org/directory - target: - kind: ClusterIssuer - name: letsencrypt - - patch: | - - op: replace - path: /metadata/name - value: letsencrypt-staging - target: - kind: ClusterIssuer - name: letsencrypt - - patch: | - - op: replace - path: /spec/acme/privateKeySecretRef/name - value: letsencrypt-staging - target: - kind: ClusterIssuer - name: letsencrypt \ No newline at end of file +# --- +# apiVersion: kustomize.toolkit.fluxcd.io/v1 +# kind: Kustomization +# metadata: +# name: infra-configs +# namespace: flux-system +# spec: +# dependsOn: +# - name: infra-controllers +# interval: 1h +# retryInterval: 1m +# timeout: 5m +# sourceRef: +# kind: GitRepository +# name: flux-system +# path: ./infrastructure/configs +# prune: true +# patches: +# - patch: | +# - op: replace +# path: /spec/acme/server +# value: https://acme-staging-v02.api.letsencrypt.org/directory +# target: +# kind: ClusterIssuer +# name: letsencrypt +# - patch: | +# - op: replace +# path: /metadata/name +# value: letsencrypt-staging +# target: +# kind: ClusterIssuer +# name: letsencrypt +# - patch: | +# - op: replace +# path: /spec/acme/privateKeySecretRef/name +# value: letsencrypt-staging +# target: +# kind: ClusterIssuer +# name: letsencrypt \ No newline at end of file diff --git a/infrastructure/configs/kustomization.yaml b/infrastructure/configs/kustomization.yaml index de1ebfa..f194683 100644 --- a/infrastructure/configs/kustomization.yaml +++ b/infrastructure/configs/kustomization.yaml @@ -1,3 +1,10 @@ + +# DEPRECATED. this is referenced in ../../clusters/{staging,production}/infrastructure.yaml +# and it's commented out which makes it not active. +# It's easier to reason and understand if we create the cluster-issuers in charts/fp/templates +# because if we do it here, we must make it Helm adoptable using annotations. +# why not just invoke it from Helm? seems better suited for there. + apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml index 6025745..f56f9e6 100644 --- a/infrastructure/controllers/kustomization.yaml +++ b/infrastructure/controllers/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: # - external-dns.yaml - - cert-manager.yaml + # - cert-manager.yaml - ingress-traefik.yaml - grafana-k8s-dashboards.yaml - kube-prometheus-stack.yaml \ No newline at end of file