From 4818667d42022c4272ba05703d319aec0f8b20d2 Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Sun, 16 Apr 2023 01:55:15 -0400 Subject: [PATCH] Move harbor into its own namespace --- cluster/apps/default/kustomization.yaml | 4 ---- cluster/apps/{default => }/harbor/harbor-ingress.yaml | 2 +- cluster/apps/{default => }/harbor/harbor-pv.yaml | 4 ++-- cluster/apps/{default => }/harbor/harbor.sops.yaml | 8 ++++---- cluster/apps/{default => }/harbor/helm-release.yaml | 2 +- cluster/apps/{default => }/harbor/helm-repository.yaml | 0 cluster/apps/{default => }/harbor/kustomization.yaml | 0 cluster/apps/kustomization.yaml | 2 +- 8 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 cluster/apps/default/kustomization.yaml rename cluster/apps/{default => }/harbor/harbor-ingress.yaml (90%) rename cluster/apps/{default => }/harbor/harbor-pv.yaml (88%) rename cluster/apps/{default => }/harbor/harbor.sops.yaml (87%) rename cluster/apps/{default => }/harbor/helm-release.yaml (97%) rename cluster/apps/{default => }/harbor/helm-repository.yaml (100%) rename cluster/apps/{default => }/harbor/kustomization.yaml (100%) diff --git a/cluster/apps/default/kustomization.yaml b/cluster/apps/default/kustomization.yaml deleted file mode 100644 index fd395f7..0000000 --- a/cluster/apps/default/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ./harbor \ No newline at end of file diff --git a/cluster/apps/default/harbor/harbor-ingress.yaml b/cluster/apps/harbor/harbor-ingress.yaml similarity index 90% rename from cluster/apps/default/harbor/harbor-ingress.yaml rename to cluster/apps/harbor/harbor-ingress.yaml index 44e5a1c..dfbdd88 100644 --- a/cluster/apps/default/harbor/harbor-ingress.yaml +++ b/cluster/apps/harbor/harbor-ingress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: harbor-core-ingress - namespace: default + namespace: harbor annotations: cert-manager.io/cluster-issuer: letsencrypt-production traefik.ingress.kubernetes.io/router.entrypoints: websecure diff --git a/cluster/apps/default/harbor/harbor-pv.yaml b/cluster/apps/harbor/harbor-pv.yaml similarity index 88% rename from cluster/apps/default/harbor/harbor-pv.yaml rename to cluster/apps/harbor/harbor-pv.yaml index dea2e8d..3e2546a 100644 --- a/cluster/apps/default/harbor/harbor-pv.yaml +++ b/cluster/apps/harbor/harbor-pv.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolume metadata: name: harbor-registry-pv - namespace: default + namespace: harbor spec: storageClassName: hostpath persistentVolumeReclaimPolicy: Retain @@ -17,7 +17,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: harbor-registry-pv-claim - namespace: default + namespace: harbor spec: storageClassName: hostpath accessModes: diff --git a/cluster/apps/default/harbor/harbor.sops.yaml b/cluster/apps/harbor/harbor.sops.yaml similarity index 87% rename from cluster/apps/default/harbor/harbor.sops.yaml rename to cluster/apps/harbor/harbor.sops.yaml index e809a9e..f443ff8 100644 --- a/cluster/apps/default/harbor/harbor.sops.yaml +++ b/cluster/apps/harbor/harbor.sops.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Secret metadata: name: harbor-secret - namespace: default + namespace: harbor stringData: REGISTRY_STORAGE_S3_ACCESSKEY: ENC[AES256_GCM,data:1k2KYsDvvQs=,iv:6GEFFeLSKH8+QxDg3rLR7q9h0jglYU4ou1byklt2x8w=,tag:JjFAs/3jsVhSBGJmbul4iQ==,type:str] REGISTRY_STORAGE_S3_SECRETKEY: ENC[AES256_GCM,data:0U40z0y7vn2wPPyGt0dYQx80QuGoj7Ni/uJMtHgrc5U=,iv:YX9acsf2G2B4RLnGez6VLD2UiwKFIqhz2X4S+uTyX50=,tag:hVJVh2aSpVz22BjGGcPOuA==,type:str] - #ENC[AES256_GCM,data:ZnoDtolYKRhyxkOwY/auWXFO,iv:4vNIwJ8iUtrmf0p0e2sTiI5wE3XTHEC1H+L33hCttvo=,tag:QEXj/nob2MQO6qBHwsHZuw==,type:comment] + #ENC[AES256_GCM,data:JGk1Br4y3LKLTdPHRD4F+hwP,iv:rzYB5JF0SeE9BWwp5btZABpfHgqKfQukXpXAa0Dy2A0=,tag:K9pJFFtcDhmrE4SfYlivwg==,type:comment] password: ENC[AES256_GCM,data:XkJEhaoRRSlxbKP94GN8dIZbj8KCwZFkcpgWNjn4vZE=,iv:Bi0D/T1izvN+l8LoZDwyUrcoN1ViS2Q6ambq2xyJFk8=,tag:ojUu0VOdnXJjbsb0XigkDg==,type:str] REDIS_PASSWORD: ENC[AES256_GCM,data:8kEbWelcGhd4v/yewnM4QshW2hzx+VWX2iFE76sKhYc=,iv:kbGieMQhMbml2SIznBX1pTncnSaxdsZ0PUynCECpjyU=,tag:HfRJA+P57IzpxuFtKD+tTg==,type:str] sops: @@ -15,8 +15,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-04-16T05:35:54Z" - mac: ENC[AES256_GCM,data:nUw6uWXcOqlndRzVmbfmCmCyHbGSBBYm4tfitpa/IL0xFcmPlL/49wKpIxYBHlEq0sPy/6/Wr27ZZV3/6C4arCX+SDzrgKpzSZ7KZE2YWHiypaCA5G+bbswOm72WTYQJ70i+qcQHGuB3QB9KixwNa6vN0Jm0hunGn6LziK8QIbA=,iv:D+IP2Ct9jNORGRcIQvgCN+v4+RrXNRTq6UfZGULyzXI=,tag:W7j8lAMHC3yQQXrNrp0XVA==,type:str] + lastmodified: "2023-04-16T05:54:57Z" + mac: ENC[AES256_GCM,data:c4DP6+KnDOXYubNbf5NqVZPxBik0a0BDiKqNLqm5dlNqjReeQFMa5BJxENelMwLMH2T/pHZ40i1UVfkTDbsy//+oWgUwZDcmN4MVDC+Y0nPqgF48K6obxJ0XgNg5tDqPWyxTMJuslMP3QDCZVyBWODb51Zzfwpd6fuiBogKdlBM=,iv:JiHRd3tFLg+UKcRfKlnyK6CEK6K6EAe/QNc0lm4Lf4w=,tag:wkt+kX3I//yN1Ob2+aiw5A==,type:str] pgp: - created_at: "2023-04-07T01:57:22Z" enc: | diff --git a/cluster/apps/default/harbor/helm-release.yaml b/cluster/apps/harbor/helm-release.yaml similarity index 97% rename from cluster/apps/default/harbor/helm-release.yaml rename to cluster/apps/harbor/helm-release.yaml index 9741b60..9896e94 100644 --- a/cluster/apps/default/harbor/helm-release.yaml +++ b/cluster/apps/harbor/helm-release.yaml @@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: harbor - namespace: default + namespace: harbor spec: interval: 5m chart: diff --git a/cluster/apps/default/harbor/helm-repository.yaml b/cluster/apps/harbor/helm-repository.yaml similarity index 100% rename from cluster/apps/default/harbor/helm-repository.yaml rename to cluster/apps/harbor/helm-repository.yaml diff --git a/cluster/apps/default/harbor/kustomization.yaml b/cluster/apps/harbor/kustomization.yaml similarity index 100% rename from cluster/apps/default/harbor/kustomization.yaml rename to cluster/apps/harbor/kustomization.yaml diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml index 7cea4d2..477d9f4 100644 --- a/cluster/apps/kustomization.yaml +++ b/cluster/apps/kustomization.yaml @@ -9,4 +9,4 @@ resources: - ./tools - ./irc - ./monitoring -- ./default \ No newline at end of file +- ./harbor \ No newline at end of file