diff --git a/flux2/README.md b/flux2/README.md index c6f022574531811150d4222006d6bd6296861c49..6c7fd51a0933999802c3b7ad46b0d796375a64a7 100644 --- a/flux2/README.md +++ b/flux2/README.md @@ -33,6 +33,5 @@ flux2 ├── local-path-provisioner # (default) storage class to safe files on disk ├── namespaces # namespaces used by OAS ├── nginx # Ingress - ├── secrets # Auto-generated secrets for applications └── sources # Helm repositories needed for HelmReleases from other folders ``` diff --git a/flux2/cluster/base/infrastructure.yaml b/flux2/cluster/base/infrastructure.yaml index 5de7ecd6ee7b75e5f19cb89006e4e13bf118bf08..53c949da1bfd9a140c56c273b6a20f21bbefd3be 100644 --- a/flux2/cluster/base/infrastructure.yaml +++ b/flux2/cluster/base/infrastructure.yaml @@ -21,7 +21,3 @@ spec: kind: HelmRelease name: local-path-provisioner namespace: kube-system - - apiVersion: helm.toolkit.fluxcd.io/v1beta1 - kind: HelmRelease - name: oas-secrets - namespace: flux-system diff --git a/flux2/infrastructure/secrets/kustomization.yaml b/flux2/infrastructure/secrets/kustomization.yaml deleted file mode 100644 index c6fd78466ae94c2384b8537ba6d4edc538326709..0000000000000000000000000000000000000000 --- a/flux2/infrastructure/secrets/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -# The secrets will be used by Flux in the postBuild Kustomization step and need -# to be in the flux-system namespace -namespace: flux-system -resources: - - release.yaml \ No newline at end of file diff --git a/flux2/infrastructure/secrets/release.yaml b/flux2/infrastructure/secrets/release.yaml deleted file mode 100644 index 4073c1768bdba6a4e64880fbe108d1e15e4dd62d..0000000000000000000000000000000000000000 --- a/flux2/infrastructure/secrets/release.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: oas-secrets -spec: - releaseName: oas-secrets - chart: - spec: - chart: ./charts/oas-secrets/ - # NOTE: Change the GitRepository yaml file if you want a different version - sourceRef: - kind: GitRepository - name: openappstack - namespace: flux-system - interval: 1h0m0s - # Allow custom values either by configMap or by secret - valuesFrom: - - kind: ConfigMap - name: oas-secrets-override - optional: true - - kind: Secret - name: oas-secrets-override - optional: true