From 4a51acea71aa0da8c6354fe2edcc79b96dc97612 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 6 Feb 2024 23:16:55 -0500 Subject: [PATCH] feat: archive wego :sadge: Signed-off-by: Devin Buhl --- .../apps/flux-system/wego/app/externalsecret.yaml | 0 .../apps/flux-system/wego/app/helmrelease.yaml | 0 .../apps/flux-system/wego/app/kustomization.yaml | 0 .../kubernetes}/apps/flux-system/wego/app/rbac.yaml | 0 .../kubernetes}/apps/flux-system/wego/ks.yaml | 0 .../main/apps/default/authelia/app/externalsecret.yaml | 3 --- .../default/authelia/app/resources/configuration.yaml | 9 --------- kubernetes/main/apps/flux-system/kustomization.yaml | 1 - .../main/flux/repositories/helm/kustomization.yaml | 2 +- 9 files changed, 1 insertion(+), 14 deletions(-) rename {kubernetes/main => .archive/kubernetes}/apps/flux-system/wego/app/externalsecret.yaml (100%) rename {kubernetes/main => .archive/kubernetes}/apps/flux-system/wego/app/helmrelease.yaml (100%) rename {kubernetes/main => .archive/kubernetes}/apps/flux-system/wego/app/kustomization.yaml (100%) rename {kubernetes/main => .archive/kubernetes}/apps/flux-system/wego/app/rbac.yaml (100%) rename {kubernetes/main => .archive/kubernetes}/apps/flux-system/wego/ks.yaml (100%) diff --git a/kubernetes/main/apps/flux-system/wego/app/externalsecret.yaml b/.archive/kubernetes/apps/flux-system/wego/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/wego/app/externalsecret.yaml rename to .archive/kubernetes/apps/flux-system/wego/app/externalsecret.yaml diff --git a/kubernetes/main/apps/flux-system/wego/app/helmrelease.yaml b/.archive/kubernetes/apps/flux-system/wego/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/wego/app/helmrelease.yaml rename to .archive/kubernetes/apps/flux-system/wego/app/helmrelease.yaml diff --git a/kubernetes/main/apps/flux-system/wego/app/kustomization.yaml b/.archive/kubernetes/apps/flux-system/wego/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/wego/app/kustomization.yaml rename to .archive/kubernetes/apps/flux-system/wego/app/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/wego/app/rbac.yaml b/.archive/kubernetes/apps/flux-system/wego/app/rbac.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/wego/app/rbac.yaml rename to .archive/kubernetes/apps/flux-system/wego/app/rbac.yaml diff --git a/kubernetes/main/apps/flux-system/wego/ks.yaml b/.archive/kubernetes/apps/flux-system/wego/ks.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/wego/ks.yaml rename to .archive/kubernetes/apps/flux-system/wego/ks.yaml diff --git a/kubernetes/main/apps/default/authelia/app/externalsecret.yaml b/kubernetes/main/apps/default/authelia/app/externalsecret.yaml index 32424d535be85..94676fb47deb3 100644 --- a/kubernetes/main/apps/default/authelia/app/externalsecret.yaml +++ b/kubernetes/main/apps/default/authelia/app/externalsecret.yaml @@ -25,7 +25,6 @@ spec: AUTHELIA_STORAGE_POSTGRES_PASSWORD: &dbPass "{{ .AUTHELIA_STORAGE_POSTGRES_PASSWORD }}" GRAFANA_OAUTH_CLIENT_SECRET: "{{ .GRAFANA_OAUTH_CLIENT_SECRET }}" MINIFLUX_OAUTH_CLIENT_SECRET: "{{ .MINIFLUX_OAUTH_CLIENT_SECRET }}" - WEAVE_GITOPS_OAUTH_CLIENT_SECRET: "{{ .WEAVE_GITOPS_OAUTH_CLIENT_SECRET }}" INIT_POSTGRES_DBNAME: *dbName INIT_POSTGRES_HOST: *dbHost INIT_POSTGRES_USER: *dbUser @@ -42,5 +41,3 @@ spec: key: lldap - extract: key: miniflux - - extract: - key: weave-gitops diff --git a/kubernetes/main/apps/default/authelia/app/resources/configuration.yaml b/kubernetes/main/apps/default/authelia/app/resources/configuration.yaml index 65a7eb64c2bad..1c2e80b0d904c 100644 --- a/kubernetes/main/apps/default/authelia/app/resources/configuration.yaml +++ b/kubernetes/main/apps/default/authelia/app/resources/configuration.yaml @@ -95,12 +95,3 @@ identity_providers: scopes: ["openid", "profile", "groups", "email"] redirect_uris: ["https://miniflux.devbu.io/oauth2/oidc/callback"] userinfo_signed_response_alg: none - - id: weave-gitops - description: Weave GitOps - secret: "$${WEAVE_GITOPS_OAUTH_CLIENT_SECRET}" - public: false - authorization_policy: two_factor - pre_configured_consent_duration: 1y - scopes: ["openid", "profile", "groups", "email"] - redirect_uris: ["https://wego.devbu.io/oauth2/callback"] - userinfo_signing_algorithm: none diff --git a/kubernetes/main/apps/flux-system/kustomization.yaml b/kubernetes/main/apps/flux-system/kustomization.yaml index 01a54b55f5ed2..668f10d7b1ada 100644 --- a/kubernetes/main/apps/flux-system/kustomization.yaml +++ b/kubernetes/main/apps/flux-system/kustomization.yaml @@ -8,4 +8,3 @@ resources: # Flux-Kustomizations - ./addons/ks.yaml - ./tf-controller/ks.yaml - - ./wego/ks.yaml diff --git a/kubernetes/main/flux/repositories/helm/kustomization.yaml b/kubernetes/main/flux/repositories/helm/kustomization.yaml index 3b9820a47772f..1ea5d2096d800 100644 --- a/kubernetes/main/flux/repositories/helm/kustomization.yaml +++ b/kubernetes/main/flux/repositories/helm/kustomization.yaml @@ -45,6 +45,6 @@ resources: - ./stakater.yaml # - ./stevehipwell.yaml # - ./victoria-metrics.yaml - - ./weaveworks.yaml + # - ./weaveworks.yaml # - ./windmill.yaml - ./xenitab.yaml