From 50e5ee5dfa0851e6514797536b582537b26e043c Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Sat, 17 Feb 2024 15:13:33 -0300 Subject: [PATCH] Changes Node Labels --- deployment/backend/backend.yaml | 2 +- deployment/frontend/frontend.yaml | 20 +-- deployment/postgres/cn-cluster.yaml | 2 +- deployment/storage/storage-processor.yaml | 158 +++++++++++----------- deployment/storage/storage.yaml | 14 +- 5 files changed, 98 insertions(+), 98 deletions(-) diff --git a/deployment/backend/backend.yaml b/deployment/backend/backend.yaml index 43a145d..559b5c8 100644 --- a/deployment/backend/backend.yaml +++ b/deployment/backend/backend.yaml @@ -14,7 +14,7 @@ spec: app: backend spec: nodeSelector: - kubernetes.io/role: worker + node_type: worker containers: - name: backend image: yoshiunfriendly/backend-hideyoshi.com diff --git a/deployment/frontend/frontend.yaml b/deployment/frontend/frontend.yaml index f4f62d4..6bf24dd 100644 --- a/deployment/frontend/frontend.yaml +++ b/deployment/frontend/frontend.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - namespace: portfolio + namespace: portfolio name: frontend-deployment labels: app: frontend @@ -16,18 +16,18 @@ spec: app: frontend spec: nodeSelector: - kubernetes.io/role: worker + node_type: worker containers: - name: frontend image: yoshiunfriendly/frontend-hideyoshi.com:latest imagePullPolicy: "Always" resources: - requests: - memory: "256Mi" - cpu: "250m" - limits: - memory: "256Mi" - cpu: "250m" + requests: + memory: "256Mi" + cpu: "250m" + limits: + memory: "256Mi" + cpu: "250m" ports: - containerPort: 5000 env: @@ -53,7 +53,7 @@ spec: apiVersion: v1 kind: Service metadata: - namespace: portfolio + namespace: portfolio name: frontend-service spec: selector: @@ -62,4 +62,4 @@ spec: - port: 5000 protocol: TCP targetPort: 5000 - type: ClusterIP \ No newline at end of file + type: ClusterIP diff --git a/deployment/postgres/cn-cluster.yaml b/deployment/postgres/cn-cluster.yaml index 0c75a78..73918b7 100644 --- a/deployment/postgres/cn-cluster.yaml +++ b/deployment/postgres/cn-cluster.yaml @@ -21,7 +21,7 @@ spec: affinity: nodeSelector: - kubernetes.io/role: master + node_type: master monitoring: enablePodMonitor: true diff --git a/deployment/storage/storage-processor.yaml b/deployment/storage/storage-processor.yaml index 4dc680e..cdff97e 100644 --- a/deployment/storage/storage-processor.yaml +++ b/deployment/storage/storage-processor.yaml @@ -1,93 +1,93 @@ apiVersion: apps/v1 kind: Deployment metadata: - namespace: portfolio - name: storage-processor-deployment + namespace: portfolio + name: storage-processor-deployment spec: - replicas: 1 - selector: - matchLabels: - app: storage-processor - template: - metadata: - labels: - app: storage-processor - spec: - nodeSelector: - kubernetes.io/role: worker - containers: - - name: storage-processor - image: yoshiunfriendly/storage-hideyoshi.com:latest - command: [ "./run-queue.sh" ] - args: [ "-q" ] - imagePullPolicy: "Always" - resources: - requests: - memory: "256Mi" - cpu: "250m" - limits: - memory: "512Mi" - cpu: "500m" - env: - - name: REDIS_BASE_URL - valueFrom: - configMapKeyRef: - name: redis-config - key: redis-url + replicas: 1 + selector: + matchLabels: + app: storage-processor + template: + metadata: + labels: + app: storage-processor + spec: + nodeSelector: + node_type: worker + containers: + - name: storage-processor + image: yoshiunfriendly/storage-hideyoshi.com:latest + command: ["./run-queue.sh"] + args: ["-q"] + imagePullPolicy: "Always" + resources: + requests: + memory: "256Mi" + cpu: "250m" + limits: + memory: "512Mi" + cpu: "500m" + env: + - name: REDIS_BASE_URL + valueFrom: + configMapKeyRef: + name: redis-config + key: redis-url - - name: REDIS_PORT - valueFrom: - configMapKeyRef: - name: redis-config - key: redis-port + - name: REDIS_PORT + valueFrom: + configMapKeyRef: + name: redis-config + key: redis-port - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: redis-secret - key: redisPassword + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: redis-secret + key: redisPassword - - name: REDIS_URL - value: "redis://:$(REDIS_PASSWORD)@$(REDIS_BASE_URL):$(REDIS_PORT)/rq" + - name: REDIS_URL + value: "redis://:$(REDIS_PASSWORD)@$(REDIS_BASE_URL):$(REDIS_PORT)/rq" - - name: STORAGE_TYPE - valueFrom: - secretKeyRef: - name: storage-secret - key: storageType + - name: STORAGE_TYPE + valueFrom: + secretKeyRef: + name: storage-secret + key: storageType - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: storage-secret - key: awsAccessKeyId + - name: AWS_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: storage-secret + key: awsAccessKeyId - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: storage-secret - key: awsSecretAccessKey + - name: AWS_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: storage-secret + key: awsSecretAccessKey - - name: AWS_REGION_NAME - valueFrom: - secretKeyRef: - name: storage-secret - key: awsRegion + - name: AWS_REGION_NAME + valueFrom: + secretKeyRef: + name: storage-secret + key: awsRegion - - name: AWS_BUCKET_NAME - valueFrom: - secretKeyRef: - name: storage-secret - key: awsBucket + - name: AWS_BUCKET_NAME + valueFrom: + secretKeyRef: + name: storage-secret + key: awsBucket - - name: VIRUS_CHECKER_TYPE - valueFrom: - secretKeyRef: - name: storage-secret - key: virusCheckerType + - name: VIRUS_CHECKER_TYPE + valueFrom: + secretKeyRef: + name: storage-secret + key: virusCheckerType - - name: VIRUS_CHECKER_API_KEY - valueFrom: - secretKeyRef: - name: storage-secret - key: virusCheckerApiKey \ No newline at end of file + - name: VIRUS_CHECKER_API_KEY + valueFrom: + secretKeyRef: + name: storage-secret + key: virusCheckerApiKey diff --git a/deployment/storage/storage.yaml b/deployment/storage/storage.yaml index fe3c216..f97558c 100644 --- a/deployment/storage/storage.yaml +++ b/deployment/storage/storage.yaml @@ -14,18 +14,18 @@ spec: app: storage spec: nodeSelector: - kubernetes.io/role: worker + node_type: worker containers: - name: storage image: yoshiunfriendly/storage-hideyoshi.com:latest imagePullPolicy: "Always" resources: - requests: - memory: "256Mi" - cpu: "250m" - limits: - memory: "256Mi" - cpu: "250m" + requests: + memory: "256Mi" + cpu: "250m" + limits: + memory: "256Mi" + cpu: "250m" ports: - containerPort: 8000 readinessProbe: