diff --git a/harbor/cert.pem b/harbor/cert.pem index a7c47e7..a3670bb 100644 --- a/harbor/cert.pem +++ b/harbor/cert.pem @@ -1,20 +1,47 @@ -----BEGIN CERTIFICATE----- -MIIDPjCCAiagAwIBAgIIKW/LEr5RHNMwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE -AxMVbWluaWNhIHJvb3QgY2EgN2ViYWMyMB4XDTI0MDcwMzEyMjAwMloXDTI2MDgw -MjEyMjAwMlowHTEbMBkGA1UEAxMSaGFyYm9yLnJlYWxtLmxvY2FsMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuZoWDhjoZWIoV0Gt2JA3xStsIDFikt1B -OuDeVnIjeE9MMQEVWNQybW1QuZZL8jEKL8UGmGwTxTVWEUluR0LnEPA5gI05nR32 -so/msmjjafHSqSs/Zc1yi2p2ueM+eIwFO4ponr8QgFZeo+iIH36QSZ6Ve8reb1NX -uhFpapiA2xxrpo7Uj1tsFL2QU8taoLYSQUMhj9E2pZ89reCYbgzemmzyv1KmiYUk -CVXzpsrV53ZAWWICjQmE20f3ChVGzE2uAzQcvlRhHKuFR3/G0Qu0FlUdxCEHF3NW -590yVjngaisz+bieer5NaE0/+HeRtM2jK23jDnJV42c/c4pbfyUmlwIDAQABo38w -fTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUC8krRWTlJvmi63tdQiwVmsFh+QIw -HQYDVR0RBBYwFIISaGFyYm9yLnJlYWxtLmxvY2FsMA0GCSqGSIb3DQEBCwUAA4IB -AQA0CoeopigQDHG9hX002L0xNY9C/pW3LL3gpyenhvPdth22M9IN5egWCkXo8Z6t -cQYtL90/wjhzHYnvJqGFYw1rTZuTnb7q2nZm90k5q3rKisRdlJmdgd2ydQKX/dTj -Wxg5WAY3ttUsSAi+v7xByHJRdOPd6q18y2AzzXY5rCUEVw35nmtDmj/vNbBjdOjZ -xkq08EQefYhBHn89KI9CP3cioeX+Cel29U+CLVEQpbfixed4PIVItnF8Mf0PHXyE -rUqRH0Yb1DSGYZ0NgA0URjpVPDUNKXcl2q+/O9b7z3FsGlOi5rBiV2UWN1MMEkfm -syNW5ATGD8qKLj6rCHnXLQce +MIIDhTCCAwqgAwIBAgISA4Pejtq3BbLp7dbIfDCwFo9QMAoGCCqGSM49BAMDMDIx +CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF +NjAeFw0yNDA4MTkwNjQwMzZaFw0yNDExMTcwNjQwMzVaMBwxGjAYBgNVBAMTEWhh +cmJvci5zb2x1c2FyLmRlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE54kRUUYx +OAAkaY6DjGRq/JV0K8I24Gl8zFO0i7QMcXehQDC8O+97d1m+pvBGXcLO1aiNIvQg +49pVb791uLFpwaOCAhQwggIQMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAUBggr +BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUGqs0h1JS +sB+x8gSY62qnMw5pVXQwHwYDVR0jBBgwFoAUkydGmAOpUWiOmNbEQkjbI79YlNIw +VQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vZTYuby5sZW5jci5v +cmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNi5pLmxlbmNyLm9yZy8wHAYDVR0RBBUw +E4IRaGFyYm9yLnNvbHVzYXIuZGUwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEFBgor +BgEEAdZ5AgQCBIH2BIHzAPEAdgAZmBBxCfDWUi4wgNKeP2S7g24ozPkPUo7u385K +Pxa0ygAAAZFpk028AAAEAwBHMEUCIG6rXpeRX64Enmp3LRSRNx+G1pCl9R31OgrB +mEOksn0oAiEA7zn3JJ26tG9pIRE3T7uHej4HckgaseZlmKfUSYvjsyEAdwBIsONr +2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAZFpk02aAAAEAwBIMEYCIQD6 +ODZ8jYcquXhojSl5rCZR3tFF4fa4p36Uht1BOx3/eAIhAJdG/1PAtmSytaITHFGV +j2ZwiVf7cpHleF+aV8OEL3w0MAoGCCqGSM49BAMDA2kAMGYCMQDxItiuL7uKyIfl +8q4XdV4DyD4sXz7ujAg92TRzayPRmuKUo8Xx6FXZQ7WrcoDIHdQCMQDLOFwKuTje +Z5l1IXerlMqoczBGWwnMSESnKZkJZu69A67l87Zi8jlFM7NAb2sv+xg= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw +WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G +h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV +6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw +gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD +ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj +v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB +AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g +BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu +Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc +MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL +pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp +eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH +pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7 +s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu +h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv +YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8 +ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0 +LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+ +EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY +Ig46v9mFmBvyH04= -----END CERTIFICATE----- diff --git a/harbor/harbor/values.yaml b/harbor/harbor/values.yaml index 44cf6ed..b8c7922 100644 --- a/harbor/harbor/values.yaml +++ b/harbor/harbor/values.yaml @@ -28,7 +28,7 @@ expose: secretName: "harbor" ingress: hosts: - core: harbor.his.de + core: harbor.solusar.de # set to the type of ingress controller if it has specific requirements. # leave as `default` for most ingress controllers. # set to `gce` if using the GCE ingress controller @@ -109,7 +109,7 @@ expose: # the IP address of k8s node # # If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://harbor.his.de +externalURL: http://harbor.solusar.de # The persistence is enabled by default and a default StorageClass # is needed in the k8s cluster to provision volumes dynamically. @@ -133,15 +133,15 @@ persistence: # Specify the "storageClass" used to provision the volume. Or the default # StorageClass will be used (the default). # Set it to "-" to disable dynamic provisioning - storageClass: "nfs-client" + storageClass: "nfs-csi" subPath: "" accessMode: ReadWriteOnce - size: 50Gi + size: 5Gi annotations: {} jobservice: jobLog: existingClaim: "" - storageClass: "nfs-client" + storageClass: "nfs-csi" subPath: "" accessMode: ReadWriteOnce size: 1Gi @@ -150,7 +150,7 @@ persistence: # be ignored database: existingClaim: "" - storageClass: "nfs-client" + storageClass: "nfs-csi" subPath: "" accessMode: ReadWriteOnce size: 1Gi @@ -159,17 +159,17 @@ persistence: # be ignored redis: existingClaim: "" - storageClass: "nfs-client" + storageClass: "nfs-csi" subPath: "" accessMode: ReadWriteOnce size: 1Gi annotations: {} trivy: existingClaim: "" - storageClass: "nfs-client" + storageClass: "nfs-csi" subPath: "" accessMode: ReadWriteOnce - size: 10Gi + size: 5Gi annotations: {} # Define which storage backend is used for registry to store # images and charts. Refer to diff --git a/harbor/ing-harbor.yaml b/harbor/ing-harbor.yaml new file mode 100644 index 0000000..6a844bb --- /dev/null +++ b/harbor/ing-harbor.yaml @@ -0,0 +1,82 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + ingress.kubernetes.io/proxy-body-size: "0" + ingress.kubernetes.io/ssl-redirect: "true" + meta.helm.sh/release-name: harbor + meta.helm.sh/release-namespace: default + nginx.ingress.kubernetes.io/proxy-body-size: "0" + nginx.ingress.kubernetes.io/ssl-redirect: "true" + creationTimestamp: "2024-07-09T11:03:41Z" + generation: 3 + labels: + app: harbor + app.kubernetes.io/instance: harbor + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: harbor + app.kubernetes.io/part-of: harbor + app.kubernetes.io/version: 2.11.0 + chart: harbor + heritage: Helm + release: harbor + name: harbor-ingress + namespace: default + resourceVersion: "3825291" + uid: dc52e471-bf5d-4cc4-b69d-bed0e65a0878 +spec: + ingressClassName: nginx + rules: + - host: harbor.realm.local + http: + paths: + - backend: + service: + name: harbor-core + port: + number: 80 + path: /api/ + pathType: Prefix + - backend: + service: + name: harbor-core + port: + number: 80 + path: /service/ + pathType: Prefix + - backend: + service: + name: harbor-core + port: + number: 80 + path: /v2/ + pathType: Prefix + - backend: + service: + name: harbor-core + port: + number: 80 + path: /chartrepo/ + pathType: Prefix + - backend: + service: + name: harbor-core + port: + number: 80 + path: /c/ + pathType: Prefix + - backend: + service: + name: harbor-portal + port: + number: 80 + path: / + pathType: Prefix + tls: + - hosts: + - harbor.realm.local + secretName: harbor +status: + loadBalancer: + ingress: + - ip: 192.168.0.82 diff --git a/harbor/key.pem b/harbor/key.pem index d289109..6f18352 100644 --- a/harbor/key.pem +++ b/harbor/key.pem @@ -1,28 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5mhYOGOhlYihX -Qa3YkDfFK2wgMWKS3UE64N5WciN4T0wxARVY1DJtbVC5lkvyMQovxQaYbBPFNVYR -SW5HQucQ8DmAjTmdHfayj+ayaONp8dKpKz9lzXKLana54z54jAU7imievxCAVl6j -6IgffpBJnpV7yt5vU1e6EWlqmIDbHGumjtSPW2wUvZBTy1qgthJBQyGP0Talnz2t -4JhuDN6abPK/UqaJhSQJVfOmytXndkBZYgKNCYTbR/cKFUbMTa4DNBy+VGEcq4VH -f8bRC7QWVR3EIQcXc1bn3TJWOeBqKzP5uJ56vk1oTT/4d5G0zaMrbeMOclXjZz9z -ilt/JSaXAgMBAAECggEASM+oA1PGJ6/AP6rmdmTtXA5S1rZJA3CFHIIG90bDn3kM -XNUd+MEWH1OZLZVGqfaPFnpmwfj0MJNh9lomRxJ5720uQb4lcfvFQfut9yOqw284 -w2DR+DAG1aaoePgrE8Nqchc0P8KYyKAZdJfOfvx5wkfSQMQvSuEZM0eNYWH+evYa -Q7O0DKtg+qbhq0IOXWvvc85995Q7RueYU30wCm8zuaWxXdk2Qq9XjaiVRbUvrnnJ -c2wwoFovyrr22E44+PHy9vtBS+R8Wk4hoq1mIgNmzNImxgnxZG5e5cSdPthPgKBd -O2jz+iD2uEqM1JNp5e+GKrC1LD+4y7/4uLhPwcLGMQKBgQDXjbadaOUB830wbZN3 -zqOrGiZ6ft1qn3JyxMl1WYNlx8URxR1kHqLu+fa9DPdqS2ecjftAd3IRK+Xjb/5r -lY0Nnv3E0rUepFDlq0Uq/9nI6HvLKDKhS3U2/oQWBQ22Pc2uwl/P9RVm+24ZOHIJ -fL/1g4e6MDQSisU9YZIPfFVJBQKBgQDcbZ7iXuz3+uXM8wapSwJc9YujUlRVZwez -HzPl7UDcw9NIPP7K2jB39mr0GoxU+GLCVMts00S51aGWgbkqhXwkRoSGVFqxG1lK -MHEWIy/1fhg3bIw0i3POQs7+c2jrkqrFFYKsR0dFZ5TrS1ctMlLmXrmIY1y93XRW -8EjJSrzT6wKBgFptw1zKMrjc03pLngA3Goafk+Dz9CPU/IiVcgbfJLbAVjacQTZN -fAFRsGejVvCq7a7KCcwD0EDP78O4qj2sId7DAqdd1koimSWg8oWVjGIy1ixmkscE -BwqpP/SU7im0R+O2+8cchHwNoyTFf2HnigiPw5MiwdW9jf2wPzxr5sOZAoGBANZd -LOTMl/tZXl4AAfxlW/j3OkMsb6NWPSCvOZNjNW78ad6Yoti3c+dWFxEpOEvx+mku -eV5t3yoyXaC2q1J02hOVGJBiPIh8JkuF7JQwyBUf+YD86SS4cXindBH0PpbJ3ZUo -pBnSf7c5UpO4gyELDZ/HgvrmVmy2jst1hfNr4VLdAoGBAI4POGsd5RlLoEbIMpN3 -JmPW5ta0hKtibDDwmQWJeXaJYhvsAaoTqVzcKvli8g2h7B4PB8qV3CkNEfP3+Qcb -0dDTiz0J4lgQJ+FE3i0Uct2EsqDv8VPXXE44dIikCSnJfYsec0F1PKATmPKEQ+yv -bu19orWv/ZiKA4wTnXJHUT8c +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgEbh7mcKIGSVYJt/g +8flJjQfuAhqvbw9Uss3bE4xvEkShRANCAATniRFRRjE4ACRpjoOMZGr8lXQrwjbg +aXzMU7SLtAxxd6FAMLw773t3Wb6m8EZdws7VqI0i9CDj2lVvv3W4sWnB -----END PRIVATE KEY----- diff --git a/harbor/values.yaml_home b/harbor/values.yaml_work similarity index 99% rename from harbor/values.yaml_home rename to harbor/values.yaml_work index 528d6d1..44cf6ed 100644 --- a/harbor/values.yaml_home +++ b/harbor/values.yaml_work @@ -28,7 +28,7 @@ expose: secretName: "harbor" ingress: hosts: - core: harbor.realm.local + core: harbor.his.de # set to the type of ingress controller if it has specific requirements. # leave as `default` for most ingress controllers. # set to `gce` if using the GCE ingress controller @@ -109,7 +109,7 @@ expose: # the IP address of k8s node # # If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: http://harbor.realm.local +externalURL: https://harbor.his.de # The persistence is enabled by default and a default StorageClass # is needed in the k8s cluster to provision volumes dynamically. @@ -133,15 +133,15 @@ persistence: # Specify the "storageClass" used to provision the volume. Or the default # StorageClass will be used (the default). # Set it to "-" to disable dynamic provisioning - storageClass: "nfs-csi" + storageClass: "nfs-client" subPath: "" accessMode: ReadWriteOnce - size: 5Gi + size: 50Gi annotations: {} jobservice: jobLog: existingClaim: "" - storageClass: "nfs-csi" + storageClass: "nfs-client" subPath: "" accessMode: ReadWriteOnce size: 1Gi @@ -150,7 +150,7 @@ persistence: # be ignored database: existingClaim: "" - storageClass: "nfs-csi" + storageClass: "nfs-client" subPath: "" accessMode: ReadWriteOnce size: 1Gi @@ -159,17 +159,17 @@ persistence: # be ignored redis: existingClaim: "" - storageClass: "nfs-csi" + storageClass: "nfs-client" subPath: "" accessMode: ReadWriteOnce size: 1Gi annotations: {} trivy: existingClaim: "" - storageClass: "nfs-csi" + storageClass: "nfs-client" subPath: "" accessMode: ReadWriteOnce - size: 5Gi + size: 10Gi annotations: {} # Define which storage backend is used for registry to store # images and charts. Refer to