diff --git a/cluster/apps/default/harbor/harbor-ingress.yaml b/cluster/apps/default/harbor/harbor-ingress.yaml new file mode 100644 index 0000000..44e5a1c --- /dev/null +++ b/cluster/apps/default/harbor/harbor-ingress.yaml @@ -0,0 +1,24 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: harbor-core-ingress + namespace: default + annotations: + cert-manager.io/cluster-issuer: letsencrypt-production + traefik.ingress.kubernetes.io/router.entrypoints: websecure +spec: + rules: + - host: &host "oci.${SECRET_NEW_DOMAIN}" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: harbor + port: + number: 80 + tls: + - hosts: + - *host + secretName: wildcard-main-tls \ No newline at end of file diff --git a/cluster/apps/default/harbor/helm-release.yaml b/cluster/apps/default/harbor/helm-release.yaml index c9f4724..6bcf79d 100644 --- a/cluster/apps/default/harbor/helm-release.yaml +++ b/cluster/apps/default/harbor/helm-release.yaml @@ -7,7 +7,7 @@ spec: interval: 5m chart: spec: - chart: harbor + chart: app-template version: 1.3.x sourceRef: kind: HelmRepository @@ -16,19 +16,22 @@ spec: values: expose: + type: clusterIP + tls: - secret: - secretName: wildcard-main-tls - notarySecretName: wildcard-main-tls - - ingress: - hosts: - core: oci.${SECRET_NEW_DOMAIN} - notary: charts.${SECRET_NEW_DOMAIN} - - annotations: - cert-manager.io/cluster-issuer: letsencrypt-production - traefik.ingress.kubernetes.io/router.entrypoints: websecure + enabled: false +# secret: +# secretName: wildcard-main-tls +# notarySecretName: wildcard-main-tls +# +# ingress: +# hosts: +# core: oci.${SECRET_NEW_DOMAIN} +# notary: charts.${SECRET_NEW_DOMAIN} +# +# annotations: +# cert-manager.io/cluster-issuer: letsencrypt-production +# traefik.ingress.kubernetes.io/router.entrypoints: websecure persistence: persistentVolumeClaim: @@ -45,7 +48,7 @@ spec: s3: bucket: harbor existingSecret: "harbor-secret" - regionendpoint: http://minio.database:9000 + regionendpoint: https://s3.seanomik.net:9000 notary: enabled: false diff --git a/cluster/apps/default/harbor/helm-repository.yaml b/cluster/apps/default/harbor/helm-repository.yaml deleted file mode 100644 index 4985cab..0000000 --- a/cluster/apps/default/harbor/helm-repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: harbor-charts - namespace: flux-system -spec: - interval: 1m - url: https://helm.goharbor.io \ No newline at end of file diff --git a/cluster/apps/default/harbor/kustomization.yaml b/cluster/apps/default/harbor/kustomization.yaml index 82fc7b8..de6cec6 100644 --- a/cluster/apps/default/harbor/kustomization.yaml +++ b/cluster/apps/default/harbor/kustomization.yaml @@ -3,4 +3,5 @@ kind: Kustomization resources: - ./harbor-pv.yaml - ./helm-repository.yaml -- ./helm-release.yaml \ No newline at end of file +- ./helm-release.yaml +- ./harbor-ingress.yaml \ No newline at end of file