diff --git a/kustomize/bases/longhorn/longhorn-helmchart.yaml b/kustomize/bases/longhorn/longhorn-helmchart.yaml index 33dd3ff..7ba4e9b 100644 --- a/kustomize/bases/longhorn/longhorn-helmchart.yaml +++ b/kustomize/bases/longhorn/longhorn-helmchart.yaml @@ -10,6 +10,7 @@ spec: targetNamespace: longhorn-system set: backupTargetCredentialSecret: s3-backupstore-credentials + ingress.host: ${LONGHORN_EXTERNAL_HOST} valuesContent: |- defaultSettings: backupTarget: s3://longhorn-backups@home/ @@ -27,4 +28,3 @@ spec: operator: Exists ingress: enabled: true - host: ${LONGHORN_EXTERNAL_HOST} diff --git a/kustomize/overlays/prod-cluster/kustomization.yaml b/kustomize/overlays/prod-cluster/kustomization.yaml index e27ca91..12304b1 100644 --- a/kustomize/overlays/prod-cluster/kustomization.yaml +++ b/kustomize/overlays/prod-cluster/kustomization.yaml @@ -10,7 +10,6 @@ commonLabels: app.kubernetes.io/managed-by: kustomize-cluster transformers: - - transformers/placeholders.yaml - transformers/ssm-secrets.yaml configMapGenerator: @@ -28,4 +27,32 @@ secretGenerator: literals: - AWS_ACCESS_KEY_ID=${ssm:/k3s/prod/longhorn/s3_access_key_id} - AWS_SECRET_ACCESS_KEY=${ssm:/k3s/prod/longhorn/s3_secret_access_key} - - AWS_ENDPOINTS=https://s3.badjware.dev \ No newline at end of file + - AWS_ENDPOINTS=https://s3.badjware.dev + +replacements: + - source: + kind: ConfigMap + name: cluster-replacements + namespace: default + fieldPath: data.TRAEFIK_EXTERNAL_HOST + targets: + - select: + kind: Ingress + name: traefik + namespace: kube-system + fieldPaths: + - spec.rules.0.host + - source: + kind: ConfigMap + name: cluster-replacements + namespace: default + fieldPath: data.LONGHORN_EXTERNAL_HOST + targets: + - select: + kind: HelmChart + name: longhorn + namespace: kube-system + fieldPaths: + - spec.set.[ingress.host] + options: + create: true \ No newline at end of file diff --git a/kustomize/overlays/prod-cluster/placeholders.txt b/kustomize/overlays/prod-cluster/placeholders.txt deleted file mode 100644 index 64830a1..0000000 --- a/kustomize/overlays/prod-cluster/placeholders.txt +++ /dev/null @@ -1,2 +0,0 @@ -TRAEFIK_EXTERNAL_HOST=traefik.badjnet.home -LONGHORN_EXTERNAL_HOST=longhorn.badjnet.home \ No newline at end of file diff --git a/kustomize/overlays/prod-cluster/transformers/placeholders.yaml b/kustomize/overlays/prod-cluster/transformers/placeholders.yaml deleted file mode 100644 index e3e18dd..0000000 --- a/kustomize/overlays/prod-cluster/transformers/placeholders.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: badjware/v1 -kind: PlaceholderTransformer -metadata: - name: placeholders -placeholdersFile: placeholders.txt \ No newline at end of file diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml index e06c32a..caea4ab 100644 --- a/kustomize/overlays/prod/kustomization.yaml +++ b/kustomize/overlays/prod/kustomization.yaml @@ -34,6 +34,14 @@ images: newTag: 6.2.5 configMapGenerator: + - name: replacements + namespace: default + literals: + - GITEA_EXTERNAL_HOST=code.badjware.dev + - DRONE_EXTERNAL_HOST=drone.badjware.dev + - NEXTCLOUD_EXTERNAL_HOST=cloud.badjware.dev + - GRAFANA_EXTERNAL_HOST=grafana.badjware.dev + - PROMETHEUS_EXTERNAL_HOST=prometheus.badjnet.home - name: ecommerce-exporter-config namespace: monitoring behavior: replace @@ -100,7 +108,6 @@ commonLabels: app.kubernetes.io/managed-by: kustomize transformers: - - transformers/placeholders.yaml - transformers/ssm-secrets.yaml patchesJson6902: @@ -117,3 +124,65 @@ patchesJson6902: # patchesStrategicMerge: # - patches/blackbox-exporter-probe-patch.yaml + +replacements: + - source: + kind: ConfigMap + name: replacements + namespace: default + fieldPath: data.GITEA_EXTERNAL_HOST + targets: + - select: + kind: Ingress + name: gitea + namespace: gitea + fieldPaths: + - spec.rules.0.host + - source: + kind: ConfigMap + name: replacements + namespace: default + fieldPath: data.DRONE_EXTERNAL_HOST + targets: + - select: + kind: Ingress + name: drone + namespace: gitea + fieldPaths: + - spec.rules.0.host + - source: + kind: ConfigMap + name: replacements + namespace: default + fieldPath: data.NEXTCLOUD_EXTERNAL_HOST + targets: + - select: + kind: Ingress + name: nextcloud + namespace: nextcloud + fieldPaths: + - spec.rules.0.host + - source: + kind: ConfigMap + name: replacements + namespace: default + fieldPath: data.GRAFANA_EXTERNAL_HOST + targets: + - select: + kind: Ingress + name: grafana + namespace: monitoring + fieldPaths: + - spec.rules.0.host + - source: + kind: ConfigMap + name: replacements + namespace: default + fieldPath: data.PROMETHEUS_EXTERNAL_HOST + targets: + - select: + kind: Ingress + name: prometheus + namespace: monitoring + fieldPaths: + - spec.rules.0.host \ No newline at end of file diff --git a/kustomize/overlays/prod/placeholders.txt b/kustomize/overlays/prod/placeholders.txt deleted file mode 100644 index 6efe037..0000000 --- a/kustomize/overlays/prod/placeholders.txt +++ /dev/null @@ -1,7 +0,0 @@ -GITEA_EXTERNAL_HOST=code.badjware.dev -DRONE_EXTERNAL_HOST=drone.badjware.dev -NEXTCLOUD_EXTERNAL_HOST=cloud.badjware.dev - -GRAFANA_EXTERNAL_HOST=grafana.badjware.dev -KUBERNETES_DASHBOARD_EXTERNAL_HOST=kubernetes-dashboard.badjnet.home -PROMETHEUS_EXTERNAL_HOST=prometheus.badjnet.home diff --git a/kustomize/overlays/prod/transformers/placeholders.yaml b/kustomize/overlays/prod/transformers/placeholders.yaml deleted file mode 100644 index e3e18dd..0000000 --- a/kustomize/overlays/prod/transformers/placeholders.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: badjware/v1 -kind: PlaceholderTransformer -metadata: - name: placeholders -placeholdersFile: placeholders.txt \ No newline at end of file