From bbf3c07bdca1ae939ce7b42c8ca1a60480ab155f Mon Sep 17 00:00:00 2001 From: Matej Feder Date: Mon, 3 Mar 2025 10:45:02 +0100 Subject: [PATCH 1/2] Update harbor Signed-off-by: Matej Feder --- base/helmrelease.yaml | 4 ++-- base/helmrepo.yaml | 2 +- envs/public/harbor-config.yaml | 22 ++++++++++++---------- envs/public/helmrelease.yaml | 2 +- operators/cert-manager/helmrelease.yaml | 4 ++-- operators/cert-manager/helmrepo.yaml | 2 +- operators/ingress-nginx/helmrelease.yaml | 4 ++-- operators/ingress-nginx/helmrepo.yaml | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/base/helmrelease.yaml b/base/helmrelease.yaml index 8fc3c0c..036e903 100644 --- a/base/helmrelease.yaml +++ b/base/helmrelease.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta2 +apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: harbor @@ -6,7 +6,7 @@ spec: chart: spec: chart: harbor - version: 1.14.2 + version: 1.16.2 sourceRef: kind: HelmRepository name: harbor-helm diff --git a/base/helmrepo.yaml b/base/helmrepo.yaml index 543131f..0262849 100644 --- a/base/helmrepo.yaml +++ b/base/helmrepo.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: harbor-helm diff --git a/envs/public/harbor-config.yaml b/envs/public/harbor-config.yaml index f8b4fc9..15bc15f 100644 --- a/envs/public/harbor-config.yaml +++ b/envs/public/harbor-config.yaml @@ -30,11 +30,10 @@ data: hosts: core: registry.scs.community className: nginx - harbor: - annotations: - cert-manager.io/issuer: letsencrypt - nginx.ingress.kubernetes.io/limit-rps: "25" - nginx.ingress.kubernetes.io/proxy-request-buffering: "off" + annotations: + cert-manager.io/issuer: letsencrypt + nginx.ingress.kubernetes.io/limit-rps: "25" + nginx.ingress.kubernetes.io/proxy-request-buffering: "off" externalURL: https://registry.scs.community database: type: internal @@ -44,19 +43,22 @@ data: enabled: true persistentVolumeClaim: database: - size: 256Gi + size: 64Gi + storageClass: csi-cinder-sc-retain redis: - size: 128Gi + size: 64Gi + storageClass: csi-cinder-sc-retain trivy: - size: 256Gi + size: 64Gi + storageClass: csi-cinder-sc-retain imageChartStorage: type: s3 s3: # generated by s3-credentials.bash existingSecret: s3-credentials - regionendpoint: https://api.gx-scs.sovereignit.cloud:8080 + regionendpoint: https://scs2.api.pco.get-cloud.io:8080 bucket: registry - region: RegionOne + region: scs2 kind: ConfigMap metadata: name: harbor-config diff --git a/envs/public/helmrelease.yaml b/envs/public/helmrelease.yaml index f13774b..9d9c051 100644 --- a/envs/public/helmrelease.yaml +++ b/envs/public/helmrelease.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta2 +apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: harbor diff --git a/operators/cert-manager/helmrelease.yaml b/operators/cert-manager/helmrelease.yaml index 24f31ce..0c3a1c3 100644 --- a/operators/cert-manager/helmrelease.yaml +++ b/operators/cert-manager/helmrelease.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta2 +apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: cert-manager @@ -7,7 +7,7 @@ spec: chart: spec: chart: cert-manager - version: v1.11.0 + version: v1.17.1 sourceRef: kind: HelmRepository name: cert-manager diff --git a/operators/cert-manager/helmrepo.yaml b/operators/cert-manager/helmrepo.yaml index 845da8e..24437e4 100644 --- a/operators/cert-manager/helmrepo.yaml +++ b/operators/cert-manager/helmrepo.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: cert-manager diff --git a/operators/ingress-nginx/helmrelease.yaml b/operators/ingress-nginx/helmrelease.yaml index 1afb92b..3c513d2 100644 --- a/operators/ingress-nginx/helmrelease.yaml +++ b/operators/ingress-nginx/helmrelease.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta2 +apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: ingress-nginx @@ -9,7 +9,7 @@ spec: chart: spec: chart: ingress-nginx - version: 4.5.2 + version: 4.12.0 sourceRef: kind: HelmRepository name: ingress-nginx diff --git a/operators/ingress-nginx/helmrepo.yaml b/operators/ingress-nginx/helmrepo.yaml index 2d2a68d..bad24f4 100644 --- a/operators/ingress-nginx/helmrepo.yaml +++ b/operators/ingress-nginx/helmrepo.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: ingress-nginx From a432ca14f523707dd276c6beb4044d4c81617652 Mon Sep 17 00:00:00 2001 From: Matej Feder Date: Mon, 3 Mar 2025 11:27:42 +0100 Subject: [PATCH 2/2] Update harbor Signed-off-by: Matej Feder --- .github/workflows/ci-test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test-workflow.yml b/.github/workflows/ci-test-workflow.yml index 50183df..b9e833c 100644 --- a/.github/workflows/ci-test-workflow.yml +++ b/.github/workflows/ci-test-workflow.yml @@ -30,7 +30,7 @@ jobs: - name: Install flux cli and do setup run: | set -e - curl -s https://fluxcd.io/install.sh | sudo FLUX_VERSION=2.2.3 bash + curl -s https://fluxcd.io/install.sh | sudo FLUX_VERSION=2.5.1 bash set -x flux install --components=source-controller,kustomize-controller,helm-controller - name: Setup GitRepository/Kustomization