.gitignore: Add IntelliJ IDEA part

harbor/application.yml

@@ -397,6 +397,7 @@ spec:
       containers:
       - name: core
         image: goharbor/harbor-core:v2.4.2
+        imagePullPolicy: IfNotPresent
         startupProbe:
           httpGet:
             path: /api/v2.0/ping
@@ -405,9 +406,16 @@ spec:
           failureThreshold: 360
           initialDelaySeconds: 10
           periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /api/v2.0/ping
+            scheme: HTTP
+            port: 8080
+          failureThreshold: 2
+          periodSeconds: 10
         readinessProbe:
           httpGet:
-            path: /api/v2.0/projects
+            path: /api/v2.0/ping
             scheme: HTTP
             port: 8080
           failureThreshold: 2
@@ -464,13 +472,6 @@ spec:
         secret:
       - name: psc
         emptyDir: {}
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
 ---
 # Source: harbor/templates/jobservice/jobservice-dpl.yaml
 apiVersion: apps/v1
@@ -501,6 +502,14 @@ spec:
       containers:
       - name: jobservice
         image: goharbor/harbor-jobservice:v2.4.2
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /api/v1/stats
+            scheme: HTTP
+            port: 8080
+          initialDelaySeconds: 300
+          periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /api/v1/stats
@@ -535,13 +544,6 @@ spec:
       - name: job-logs
         persistentVolumeClaim:
           claimName: harbor-jobservice
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
 ---
 # Source: harbor/templates/portal/deployment.yaml
 apiVersion: apps/v1
@@ -572,6 +574,14 @@ spec:
       containers:
       - name: portal
         image: goharbor/harbor-portal:v2.4.2
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /
+            scheme: HTTP
+            port: 8080
+          initialDelaySeconds: 300
+          periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /
@@ -589,13 +599,6 @@ spec:
       - name: portal-config
         configMap:
           name: "harbor-portal"
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
 ---
 # Source: harbor/templates/registry/registry-dpl.yaml
 apiVersion: apps/v1
@@ -626,6 +629,14 @@ spec:
       containers:
       - name: registry
         image: goharbor/registry-photon:v2.4.2
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /
+            scheme: HTTP
+            port: 5000
+          initialDelaySeconds: 300
+          periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /
@@ -653,6 +664,14 @@ spec:
           subPath: config.yml
       - name: registryctl
         image: goharbor/harbor-registryctl:v2.4.2
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /api/health
+            scheme: HTTP
+            port: 8080
+          initialDelaySeconds: 300
+          periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /api/health
@@ -703,13 +722,6 @@ spec:
       - name: registry-data
         persistentVolumeClaim:
           claimName: harbor-registry
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
 ---
 # Source: harbor/templates/database/database-ss.yaml
 apiVersion: apps/v1
@@ -744,6 +756,7 @@ spec:
       # we may remove it after several releases
       - name: "data-migrator"
         image: goharbor/harbor-db:v2.4.2
+        imagePullPolicy: IfNotPresent
         command: ["/bin/sh"]
         args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"]
         volumeMounts:
@@ -756,6 +769,7 @@ spec:
       # as "fsGroup" applied before the init container running, the container has enough permission to execute the command
       - name: "data-permissions-ensurer"
         image: goharbor/harbor-db:v2.4.2
+        imagePullPolicy: IfNotPresent
         command: ["/bin/sh"]
         args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"]
         volumeMounts:
@@ -765,6 +779,13 @@ spec:
       containers:
       - name: database
         image: goharbor/harbor-db:v2.4.2
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          exec:
+            command:
+            - /docker-healthcheck.sh
+          initialDelaySeconds: 300
+          periodSeconds: 10
         readinessProbe:
           exec:
             command:
@@ -790,13 +811,6 @@ spec:
         emptyDir:
           medium: Memory
           sizeLimit: 512Mi
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
   volumeClaimTemplates:
   - metadata:
       name: "database-data"
@@ -839,6 +853,12 @@ spec:
       containers:
       - name: redis
         image: goharbor/redis-photon:v2.4.2
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          tcpSocket:
+            port: 6379
+          initialDelaySeconds: 300
+          periodSeconds: 10
         readinessProbe:
           tcpSocket:
             port: 6379
@@ -848,13 +868,6 @@ spec:
         - name: data
           mountPath: /var/lib/redis
           subPath: 
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
   volumeClaimTemplates:
   - metadata:
       name: data
@@ -957,6 +970,15 @@ spec:
             mountPath: /home/scanner/.cache
             subPath: 
             readOnly: false
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /probe/healthy
+              port: api-server
+            initialDelaySeconds: 5
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 10
           readinessProbe:
             httpGet:
               scheme: HTTP
@@ -973,13 +995,6 @@ spec:
             requests:
               cpu: 200m
               memory: 512Mi
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-      - key: dedicated
-        operator: Equal
-        value: storage
-        effect: NoSchedule
   volumeClaimTemplates:
   - metadata:
       name: data

logging/deployment.yml

@@ -1,5 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: deployment

prometheus-operator/blackbox-exporter.yml

@@ -156,7 +156,7 @@ metadata:
   name: blackbox-exporter
 spec:
   revisionHistoryLimit: 0
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: blackbox-exporter