diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml index 7080a74..86f7852 100644 --- a/cluster/apps/kustomization.yaml +++ b/cluster/apps/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- traefik +- ./traefik diff --git a/cluster/apps/traefik/helm-release.yaml b/cluster/apps/traefik/helm-release.yaml index dae52be..ed885b0 100644 --- a/cluster/apps/traefik/helm-release.yaml +++ b/cluster/apps/traefik/helm-release.yaml @@ -1,3 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: traefik +--- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/cluster/apps/traefik/ksops.yaml b/cluster/apps/traefik/ksops.yaml deleted file mode 100644 index 090010e..0000000 --- a/cluster/apps/traefik/ksops.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: viaduct.ai/v1 -kind: ksops -metadata: - name: traefik-secret-generator - annotations: - config.kubernetes.io/function: | - exec: - path: ksops -files: -- ./traefik-secrets.enc.yaml diff --git a/cluster/apps/traefik/kustomization.yaml b/cluster/apps/traefik/kustomization.yaml index 80bb0fe..addb03d 100644 --- a/cluster/apps/traefik/kustomization.yaml +++ b/cluster/apps/traefik/kustomization.yaml @@ -1,8 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -#generators: -#- ksops.yaml resources: -- traefik-secrets.sops.yaml -- helm-repository.yaml -- helm-release.yaml +- ./traefik-secrets.sops.yaml +- ./helm-repository.yaml +- ./helm-release.yaml diff --git a/cluster/apps/traefik/traefik-secrets.sops.yaml b/cluster/apps/traefik/traefik-secrets.sops.yaml index aabc1e8..240a4d4 100644 --- a/cluster/apps/traefik/traefik-secrets.sops.yaml +++ b/cluster/apps/traefik/traefik-secrets.sops.yaml @@ -13,8 +13,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-04-02T17:15:20Z" - mac: ENC[AES256_GCM,data:aJlH+CJloGHMBlbWns9cCmNIUGSJPG43QnJdxEFDArUwRSQRtpM8IiCrIK/RrsP3GHzvZkbNIMSoFeXDq/KfW2ZbGIrDuvGjSwpKSd/tV40NulSOZILZViTV5FNrIO4q05spv0QoGsPcF9CSvRGpQ98w5RbPxQm6U6aYl6cM+7c=,iv:yhu+Zh9ksE2A0MlqDTknNcywpJhxjgTAD7a7VkRqslA=,tag:XGTJaPkAZyQeKG+xsUg0/Q==,type:str] + lastmodified: "2023-04-02T18:05:11Z" + mac: ENC[AES256_GCM,data:6e5z7+3l0Sn+Lw9vibQ//SgYMskY+TiRbMYX18JuIT+dCJHN3fz0FZCIUSTJXDIXv0SqHSEAgVpMCvyWwPoSgfeIc/3sKKKZ33yP4tv8rdpYBaDz7zXXY3NYqOk8BFeIdl6mzU6traIyzxAQ27rjO6AI0fEFSu5bY4uP9lFPtdc=,iv:sJ2iTk3P83NM9I3atYZvkYJg42IAIO29L7nMt37Lazk=,tag:1UtotsQ9VqBC66fI6kVr0g==,type:str] pgp: - created_at: "2023-04-02T17:33:57Z" enc: | diff --git a/cluster/flux-system/apps.yaml b/cluster/flux-system/apps.yaml deleted file mode 100644 index 63a473d..0000000 --- a/cluster/flux-system/apps.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 -kind: Kustomization -metadata: - name: cluster-apps - namespace: flux-system -spec: - interval: 30m - path: ./cluster/apps - prune: true - sourceRef: - kind: GitRepository - name: home-kubernetes - decryption: - provider: sops - secretRef: - name: sops-age - postBuild: - substituteFrom: - - kind: ConfigMap - name: cluster-settings - - kind: Secret - name: cluster-secrets - patches: - - patch: |- - apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 - kind: Kustomization - metadata: - name: not-used - spec: - decryption: - provider: sops - secretRef: - name: sops-gpg - postBuild: - substituteFrom: - - kind: ConfigMap - name: cluster-settings - - kind: Secret - name: cluster-secrets - target: - group: kustomize.toolkit.fluxcd.io - version: v1beta2 - kind: Kustomization - labelSelector: substitution.flux.home.arpa/disabled notin (true) \ No newline at end of file diff --git a/cluster/flux-system/kustomization.yaml b/cluster/flux-system/kustomization.yaml index 757ca80..18517c8 100644 --- a/cluster/flux-system/kustomization.yaml +++ b/cluster/flux-system/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- gotk-components.yaml -- gotk-sync.yaml -#- apps.yaml +- ./gotk-components.yaml +- ./gotk-sync.yaml