diff --git a/harbor-helm/values.yaml b/harbor-helm/values.yaml index d614523..4914f44 100644 --- a/harbor-helm/values.yaml +++ b/harbor-helm/values.yaml @@ -220,14 +220,14 @@ 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: "local-vkus2" + storageClass: "local-zgus1" subPath: "" accessMode: ReadWriteOnce size: 5Gi annotations: {} chartmuseum: existingClaim: "" - storageClass: "local-vkus2" + storageClass: "local-zgus1" subPath: "" accessMode: ReadWriteOnce size: 5Gi @@ -235,7 +235,7 @@ persistence: jobservice: jobLog: existingClaim: "" - storageClass: "local-vkus2" + storageClass: "local-zgus1" subPath: "" accessMode: ReadWriteOnce size: 1Gi @@ -244,7 +244,7 @@ persistence: # be ignored database: existingClaim: "" - storageClass: "local-vkus2" + storageClass: "local-zgus1" subPath: "" accessMode: ReadWriteOnce size: 1Gi @@ -253,14 +253,14 @@ persistence: # be ignored redis: existingClaim: "" - storageClass: "local-vkus2" + storageClass: "local-zgus1" subPath: "" accessMode: ReadWriteOnce size: 1Gi annotations: {} trivy: existingClaim: "" - storageClass: "local-vkus2" + storageClass: "local-zgus1" subPath: "" accessMode: ReadWriteOnce size: 5Gi @@ -429,7 +429,7 @@ nginx: # memory: 256Mi # cpu: 100m nodeSelector: {} - # kubernetes.io/hostname: vkvm-us2 + # kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: nodeAffinity: @@ -461,7 +461,7 @@ portal: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -488,7 +488,7 @@ core: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -547,7 +547,7 @@ jobservice: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -584,7 +584,7 @@ registry: replicas: 1 revisionHistoryLimit: 10 nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -644,7 +644,7 @@ chartmuseum: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -720,7 +720,7 @@ trivy: cpu: 1 memory: 1Gi nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -744,7 +744,7 @@ notary: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -767,7 +767,7 @@ notary: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## Additional deployment annotations @@ -811,7 +811,7 @@ database: readinessProbe: timeoutSeconds: 1 nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## The priority class to run the pod as @@ -872,7 +872,7 @@ redis: # memory: 256Mi # cpu: 100m nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} ## The priority class to run the pod as @@ -926,7 +926,7 @@ exporter: repository: goharbor/harbor-exporter tag: v2.7.4 nodeSelector: - kubernetes.io/hostname: vkvm-us2 + kubernetes.io/hostname: zgocloud-us1 tolerations: [] affinity: {} cacheDuration: 23 diff --git a/mirrors/dockerio/load.yaml b/mirrors/dockerio/load.yaml index 30eb26d..e355c4e 100644 --- a/mirrors/dockerio/load.yaml +++ b/mirrors/dockerio/load.yaml @@ -30,7 +30,7 @@ spec: - key: kubernetes.io/hostname operator: In values: - - claw-hk2 + - zgocloud-us1 containers: - name: dockerio image: registry:2.8.3 diff --git a/searxng/manifests/searxng-statefulset.yaml b/searxng/manifests/searxng-statefulset.yaml index fc33144..58dd088 100644 --- a/searxng/manifests/searxng-statefulset.yaml +++ b/searxng/manifests/searxng-statefulset.yaml @@ -1,5 +1,6 @@ apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment +#kind: StatefulSet metadata: annotations: kompose.cmd: kompose convert -f compose.yml --namespace searxng -o manifests/ @@ -20,14 +21,14 @@ spec: selector: matchLabels: io.kompose.service: searxng - serviceName: searxng + #serviceName: searxng template: metadata: labels: io.kompose.service: searxng spec: nodeSelector: - dc: vkus + region: us containers: - env: - name: SEARXNG_BASE_URL @@ -49,11 +50,11 @@ spec: - SETUID drop: - ALL - volumeMounts: - - mountPath: /etc/searxng - name: searxng-claim0 +# volumeMounts: +# - mountPath: /etc/searxng +# name: searxng-claim0 restartPolicy: Always - volumes: - - name: searxng-claim0 - persistentVolumeClaim: - claimName: searxng-claim0 +# volumes: +# - name: searxng-claim0 +# persistentVolumeClaim: +# claimName: searxng-claim0 diff --git a/today_ai_weather/db/load.yaml b/today_ai_weather/db/load.yaml index 1eb938a..c9e82d2 100644 --- a/today_ai_weather/db/load.yaml +++ b/today_ai_weather/db/load.yaml @@ -18,7 +18,7 @@ spec: spec: nodeSelector: region: us - kubernetes.io/hostname: vkvm-us1 + kubernetes.io/hostname: zgocloud-us1 containers: - name: pg image: postgres:16 @@ -40,5 +40,5 @@ spec: volumes: - name: pg-data persistentVolumeClaim: - claimName: pg-data-local-vkus1-pvc + claimName: pg-data-local-zgus1-pvc diff --git a/today_ai_weather/db/pvc.yaml b/today_ai_weather/db/pvc.yaml index 4c6be43..3716337 100644 --- a/today_ai_weather/db/pvc.yaml +++ b/today_ai_weather/db/pvc.yaml @@ -2,7 +2,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: pg-data-local-vkus1-pvc + name: pg-data-local-zgus1-pvc namespace: taw spec: accessModes: @@ -10,5 +10,5 @@ spec: resources: requests: storage: 10Gi - storageClassName: local-vkus1 + storageClassName: local-zgus1 diff --git a/today_ai_weather/redis/load.yaml b/today_ai_weather/redis/load.yaml index 3cfe9f0..b3a359b 100644 --- a/today_ai_weather/redis/load.yaml +++ b/today_ai_weather/redis/load.yaml @@ -17,8 +17,8 @@ spec: app: redis spec: nodeSelector: - #dc: aliyun-gz region: us + kubernetes.io/hostname: zgocloud-us1 containers: - name: redis image: redis:7-alpine @@ -34,5 +34,5 @@ spec: volumes: - name: taw-redis-data persistentVolumeClaim: - claimName: taw-redis-data-local-vkus1-pvc + claimName: taw-redis-data-local-zgus1-pvc diff --git a/today_ai_weather/redis/pvc.yaml b/today_ai_weather/redis/pvc.yaml index 3ddf281..67de3f9 100644 --- a/today_ai_weather/redis/pvc.yaml +++ b/today_ai_weather/redis/pvc.yaml @@ -2,7 +2,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: taw-redis-data-local-vkus1-pvc + name: taw-redis-data-local-zgus1-pvc namespace: taw spec: accessModes: @@ -10,5 +10,5 @@ spec: resources: requests: storage: 1Gi - storageClassName: local-vkus1 + storageClassName: local-zgus1