Merge pull request #939 from ywk253100/210429__1.5.5

Bump up OSS Harbor to v2.1.5
goharbor · Apr 29, 2021 · d638e84 · d638e84
2 parents 5d45bf7 + 606b764
commit d638e84
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 19 deletions.
diff --git a/.helmignore b/.helmignore
@@ -1,6 +1,6 @@
+.github/*
 docs/*
 .git/*
 .gitignore
 CONTRIBUTING.md
-.travis.yaml
 test/*
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: harbor
-version: 1.5.4
-appVersion: 2.1.4
+version: 1.5.5
+appVersion: 2.1.5
 description: An open source trusted cloud native registry that stores, signs, and scans content
 keywords:
 - docker

diff --git a/templates/ingress/ingress.yaml b/templates/ingress/ingress.yaml
@@ -30,8 +30,10 @@
 ---
 {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: extensions/v1beta1
-{{- else }}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
@@ -61,6 +63,7 @@ spec:
   rules:
   - http:
       paths:
+{{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
       - path: {{ .portal_path }}
         backend:
           serviceName: {{ template "harbor.portal" . }}
@@ -85,6 +88,50 @@ spec:
         backend:
           serviceName: {{ template "harbor.core" . }}
           servicePort: {{ template "harbor.core.servicePort" . }}
+{{- else }}
+      - path: {{ .portal_path }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.portal" . }}
+            port:
+              number: {{ template "harbor.portal.servicePort" . }}
+      - path: {{ .api_path }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.core" . }}
+            port:
+              number: {{ template "harbor.core.servicePort" . }}
+      - path: {{ .service_path }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.core" . }}
+            port:
+              number: {{ template "harbor.core.servicePort" . }}
+      - path: {{ .v2_path }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.core" . }}
+            port:
+              number: {{ template "harbor.core.servicePort" . }}
+      - path: {{ .chartrepo_path }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.core" . }}
+            port:
+              number: {{ template "harbor.core.servicePort" . }}
+      - path: {{ .controller_path }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.core" . }}
+            port:
+              number: {{ template "harbor.core.servicePort" . }}
+{{- end }}
     {{- if $ingress.hosts.core }}
     host: {{ $ingress.hosts.core }}
     {{- end }}
@@ -93,8 +140,10 @@ spec:
 ---
 {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: extensions/v1beta1
-{{- else }}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
@@ -122,9 +171,18 @@ spec:
   - http:
       paths:
       - path: {{ .notary_path }}
+{{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
         backend:
           serviceName: {{ template "harbor.notary-server" . }}
           servicePort: 4443
+{{- else }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ template "harbor.notary-server" . }}
+            port:
+              number: 4443
+{{- end -}}
     {{- if $ingress.hosts.notary }}
     host: {{ $ingress.hosts.notary }}
     {{- end }}

diff --git a/values.yaml b/values.yaml
@@ -375,7 +375,7 @@ proxy:
 nginx:
   image:
     repository: goharbor/nginx-photon
-    tag: v2.1.4
+    tag: v2.1.5
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   replicas: 1
@@ -392,7 +392,7 @@ nginx:
 portal:
   image:
     repository: goharbor/harbor-portal
-    tag: v2.1.4
+    tag: v2.1.5
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   replicas: 1
@@ -409,7 +409,7 @@ portal:
 core:
   image:
     repository: goharbor/harbor-core
-    tag: v2.1.4
+    tag: v2.1.5
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   replicas: 1
@@ -443,7 +443,7 @@ core:
 jobservice:
   image:
     repository: goharbor/harbor-jobservice
-    tag: v2.1.4
+    tag: v2.1.5
   replicas: 1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
@@ -470,15 +470,15 @@ registry:
   registry:
     image:
       repository: goharbor/registry-photon
-      tag: v2.1.4
+      tag: v2.1.5
     # resources:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
   controller:
     image:
       repository: goharbor/harbor-registryctl
-      tag: v2.1.4
+      tag: v2.1.5
 
     # resources:
     #  requests:
@@ -525,7 +525,7 @@ chartmuseum:
   absoluteUrl: false
   image:
     repository: goharbor/chartmuseum-photon
-    tag: v2.1.4
+    tag: v2.1.5
   replicas: 1
   # resources:
   #  requests:
@@ -544,15 +544,15 @@ clair:
   clair:
     image:
       repository: goharbor/clair-photon
-      tag: v2.1.4
+      tag: v2.1.5
     # resources:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
   adapter:
     image:
       repository: goharbor/clair-adapter-photon
-      tag: v2.1.4
+      tag: v2.1.5
     # resources:
     #  requests:
     #    memory: 256Mi
@@ -574,7 +574,7 @@ trivy:
     # repository the repository for Trivy adapter image
     repository: goharbor/trivy-adapter-photon
     # tag the tag for Trivy adapter image
-    tag: v2.1.4
+    tag: v2.1.5
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # replicas the number of Pod replicas
@@ -631,7 +631,7 @@ notary:
     serviceAccountName: ""
     image:
       repository: goharbor/notary-server-photon
-      tag: v2.1.4
+      tag: v2.1.5
     replicas: 1
     # resources:
     #  requests:
@@ -642,7 +642,7 @@ notary:
     serviceAccountName: ""
     image:
       repository: goharbor/notary-signer-photon
-      tag: v2.1.4
+      tag: v2.1.5
     replicas: 1
     # resources:
     #  requests:
@@ -670,7 +670,7 @@ database:
     serviceAccountName: ""
     image:
       repository: goharbor/harbor-db
-      tag: v2.1.4
+      tag: v2.1.5
     # The initial superuser password for internal database
     password: "changeit"
     # resources:
@@ -716,7 +716,7 @@ redis:
     serviceAccountName: ""
     image:
       repository: goharbor/redis-photon
-      tag: v2.1.4
+      tag: v2.1.5
     # resources:
     #  requests:
     #    memory: 256Mi