harbor: Move to storage nodes

This commit is contained in:
Lauri Võsandi 2022-10-04 13:39:25 +03:00
parent 04b786b18d
commit 8ee1896a55

View File

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