Merge pull request #96 from ywk253100/181127_upgrade

Update Harbor chart according to the requirement for upgrade

README.md

@@ -91,27 +91,27 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `persistence.resourcePolicy`     | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` |
 | `persistence.persistentVolumeClaim.registry.existingClaim`     | Use the existing PVC which must be created manually before bound | |
 |`persistence.persistentVolumeClaim.registry.storageClass`     | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used(the default). Set it to `-` to disable dynamic provisioning | |
-|`persistence.persistentVolumeClaim.registry.subPath`     | The sub path used in the volume | `registry` |
-|`persistence.persistentVolumeClaim.registry.accessMode`     | The access mode of the volume | `ReadWriteMany` |
+|`persistence.persistentVolumeClaim.registry.subPath`     | The sub path used in the volume | |
+|`persistence.persistentVolumeClaim.registry.accessMode`     | The access mode of the volume | `ReadWriteOnce` |
 |`persistence.persistentVolumeClaim.registry.size`     | The size of the volume | `5Gi` |
 |`persistence.persistentVolumeClaim.chartmuseum.existingClaim`     | Use the existing PVC which must be created manually before bound | |
 |`persistence.persistentVolumeClaim.chartmuseum.storageClass`     | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used(the default). Set it to `-` to disable dynamic provisioning | |
-|`persistence.persistentVolumeClaim.chartmuseum.subPath`     | The sub path used in the volume | `chartmuseum` |
-|`persistence.persistentVolumeClaim.chartmuseum.accessMode`     | The access mode of the volume | `ReadWriteMany` |
+|`persistence.persistentVolumeClaim.chartmuseum.subPath`     | The sub path used in the volume | |
+|`persistence.persistentVolumeClaim.chartmuseum.accessMode`     | The access mode of the volume | `ReadWriteOnce` |
 |`persistence.persistentVolumeClaim.chartmuseum.size`     | The size of the volume | `5Gi` |
 |`persistence.persistentVolumeClaim.jobservice.existingClaim`     | Use the existing PVC which must be created manually before bound | |
 |`persistence.persistentVolumeClaim.jobservice.storageClass`     | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used(the default). Set it to `-` to disable dynamic provisioning | |
-|`persistence.persistentVolumeClaim.jobservice.subPath`     | The sub path used in the volume | `jobservice` |
-|`persistence.persistentVolumeClaim.jobservice.accessMode`     | The access mode of the volume | `ReadWriteMany` |
+|`persistence.persistentVolumeClaim.jobservice.subPath`     | The sub path used in the volume | |
+|`persistence.persistentVolumeClaim.jobservice.accessMode`     | The access mode of the volume | `ReadWriteOnce` |
 |`persistence.persistentVolumeClaim.jobservice.size`     | The size of the volume | `1Gi` |
 |`persistence.persistentVolumeClaim.database.existingClaim`     | Use the existing PVC which must be created manually before bound. If external database is used, the setting will be ignored | |
 |`persistence.persistentVolumeClaim.database.storageClass`     | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used(the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | |
-|`persistence.persistentVolumeClaim.database.subPath`     | The sub path used in the volume. If external database is used, the setting will be ignored | `database` |
+|`persistence.persistentVolumeClaim.database.subPath`     | The sub path used in the volume. If external database is used, the setting will be ignored | |
 |`persistence.persistentVolumeClaim.database.accessMode`     | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` |
 |`persistence.persistentVolumeClaim.database.size`     | The size of the volume. If external database is used, the setting will be ignored | `1Gi` |
 |`persistence.persistentVolumeClaim.redis.existingClaim`     | Use the existing PVC which must be created manually before bound. If external Redis is used, the setting will be ignored | |
 |`persistence.persistentVolumeClaim.redis.storageClass`     | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used(the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | |
-|`persistence.persistentVolumeClaim.redis.subPath`     | The sub path used in the volume. If external Redis is used, the setting will be ignored | `redis` |
+|`persistence.persistentVolumeClaim.redis.subPath`     | The sub path used in the volume. If external Redis is used, the setting will be ignored | |
 |`persistence.persistentVolumeClaim.redis.accessMode`     | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` |
 |`persistence.persistentVolumeClaim.redis.size`     | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` |
 |`persistence.imageChartStorage.type`     | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` |

docs/High Availability.md

@@ -46,6 +46,8 @@ Configure the followings items in `values.yaml`, you can also set them as parame
 
    If you want to specify the `StorageClass`, set `persistence.persistentVolumeClaim.registry.storageClass`, `persistence.persistentVolumeClaim.chartmuseum.storageClass` and `persistence.persistentVolumeClaim.jobservice.storageClass`.  
 
+   If you use `StorageClass`, for both default or specified one, set `persistence.persistentVolumeClaim.registry.accessMode`, `persistence.persistentVolumeClaim.chartmuseum.accessMode` and `persistence.persistentVolumeClaim.jobservice.accessMode` as `ReadWriteMany`, and make sure that the persistent volumes must can be shared cross different nodes.  
+
    You can also use the existing PVCs to store data, set `persistence.persistentVolumeClaim.registry.existingClaim`, `persistence.persistentVolumeClaim.chartmuseum.existingClaim` and `persistence.persistentVolumeClaim.jobservice.existingClaim`.  
 
    If you have no PVCs that can be shared across nodes, you can use external object storage to store images and charts and store the job logs in database. Set the `persistence.imageChartStorage.type` to the value you want to use and fill the corresponding section and set `jobservice.jobLogger` to `database`.  

templates/adminserver/adminserver-dpl.yaml

@@ -16,6 +16,9 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: adminserver
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/adminserver/adminserver-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/adminserver/adminserver-secrets.yaml") . | sha256sum }}
     spec:
       containers:
       - name: adminserver

templates/chartmuseum/chartmuseum-dpl.yaml

@@ -17,6 +17,9 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: chartmuseum
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/chartmuseum/chartmuseum-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/chartmuseum/chartmuseum-secret.yaml") . | sha256sum }}
     spec:
       containers:
       - name: chartmuseum

templates/clair/clair-dpl.yaml

@@ -17,6 +17,8 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: clair
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/clair/clair-cm.yaml") . | sha256sum }}
     spec:
       containers:
       - name: clair

templates/core/core-dpl.yaml

@@ -16,6 +16,9 @@ spec:
       labels:
 {{ include "harbor.matchLabels" . | indent 8 }}
         component: core
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }}
     spec:
       containers:
       - name: core

templates/database/database-ss.yaml

@@ -19,6 +19,8 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: database
+      annotations:
+        checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }}
     spec:
       initContainers:
       - name: "remove-lost-found"

templates/jobservice/jobservice-dpl.yaml

@@ -16,6 +16,9 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: jobservice
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }}
     spec:
       containers:
       - name: jobservice

templates/nginx/deployment.yaml

@@ -17,6 +17,15 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: nginx
+      annotations:
+      {{- if not .Values.expose.tls.enabled }}
+        checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }}
+      {{- else }}
+        checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }}
+      {{- end }}
+      {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }}
+        checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }}
+      {{- end }}
     spec:
       containers:
       - name: nginx

templates/notary/notary-server.yaml

@@ -17,6 +17,8 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: notary-server
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/notary/notary-cm.yaml") . | sha256sum }}
     spec:
       containers:
       - name: notary-server

templates/notary/notary-signer.yaml

@@ -17,6 +17,8 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: notary-signer
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/notary/notary-cm.yaml") . | sha256sum }}
     spec:
       containers:
       - name: notary-signer

templates/registry/registry-dpl.yaml

@@ -16,6 +16,9 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: registry
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }}
     spec:
       containers:
       - name: registry

values.yaml

@@ -98,35 +98,35 @@ persistence:
       # StorageClass will be used(the default).
       # Set it to "-" to disable dynamic provisioning
       storageClass: ""
-      subPath: "registry"
-      accessMode: ReadWriteMany
+      subPath: ""
+      accessMode: ReadWriteOnce
       size: 5Gi
     chartmuseum:
       existingClaim: ""
       storageClass: ""
-      subPath: "chartmuseum"
-      accessMode: ReadWriteMany
+      subPath: ""
+      accessMode: ReadWriteOnce
       size: 5Gi
     jobservice:
       existingClaim: ""
       storageClass: ""
-      subPath: "jobservice"
-      accessMode: ReadWriteMany
+      subPath: ""
+      accessMode: ReadWriteOnce
       size: 1Gi
     # If external database is used, the following settings for database will 
     # be ignored
     database:
       existingClaim: ""
       storageClass: ""
-      subPath: "database"
+      subPath: ""
       accessMode: ReadWriteOnce
       size: 1Gi
     # If external Redis is used, the following settings for Redis will 
     # be ignored
     redis:
       existingClaim: ""
       storageClass: ""
-      subPath: "redis"
+      subPath: ""
       accessMode: ReadWriteOnce
       size: 1Gi
   # Define which storage backend is used for registry and chartmuseum to store