diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 78a6183..e3a13ed 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -3,5 +3,5 @@ kind: Kustomization resources: - manifests/00-namespaces.yaml - - manifests/10-repo-prod.yaml - - manifests/20-hrel-prod.yaml + - manifests/10-repository.yaml + - manifests/20-prod.yaml diff --git a/deployments/manifests/10-repo-dev.yaml b/deployments/manifests/10-repo-dev.yaml deleted file mode 100644 index fd83749..0000000 --- a/deployments/manifests/10-repo-dev.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: GitRepository -metadata: - name: home-server-dev - namespace: flux-system -spec: - interval: 1m - url: ssh://git@repobase.net/j/home-server.git - secretRef: - name: flux-ssh - ref: - branch: dev diff --git a/deployments/manifests/10-repo-prod.yaml b/deployments/manifests/10-repo-prod.yaml deleted file mode 100644 index 157c0bd..0000000 --- a/deployments/manifests/10-repo-prod.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: GitRepository -metadata: - name: hsp-system - namespace: flux-system -spec: - interval: 1m - url: ssh://git@repobase.net/j/home-server.git - secretRef: - name: flux-ssh - ref: - branch: main - diff --git a/deployments/manifests/10-repository.yaml b/deployments/manifests/10-repository.yaml new file mode 100644 index 0000000..c829c71 --- /dev/null +++ b/deployments/manifests/10-repository.yaml @@ -0,0 +1,27 @@ +#--- +#apiVersion: source.toolkit.fluxcd.io/v1beta2 +#kind: GitRepository +#metadata: +# name: home-server-dev +# namespace: flux-system +#spec: +# interval: 1m +# url: ssh://git@repobase.net/j/home-server.git +# secretRef: +# name: flux-ssh +# ref: +# branch: dev +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: GitRepository +metadata: + name: hsp-system + namespace: flux-system +spec: + interval: 1m + url: ssh://git@repobase.net/j/home-server.git + secretRef: + name: flux-ssh + ref: + branch: main + diff --git a/deployments/manifests/20-hrel-dev.yaml b/deployments/manifests/20-dev.yaml similarity index 100% rename from deployments/manifests/20-hrel-dev.yaml rename to deployments/manifests/20-dev.yaml diff --git a/deployments/manifests/20-hrel-prod.yaml b/deployments/manifests/20-prod.yaml similarity index 93% rename from deployments/manifests/20-hrel-prod.yaml rename to deployments/manifests/20-prod.yaml index 6b9102c..d00bf1d 100644 --- a/deployments/manifests/20-hrel-prod.yaml +++ b/deployments/manifests/20-prod.yaml @@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: - name: hsp-release + name: hsp-system namespace: hsp-system spec: interval: 1m