From 9b7f8038e54c0fed3b190a2fd6769dec2ba221e6 Mon Sep 17 00:00:00 2001
From: Jamalac Orange <14492-x-JaOrang@users.noreply.gitlab.inria.fr>
Date: Thu, 1 Dec 2022 18:02:04 +0100
Subject: [PATCH] feat(k8s): update nodeSelector
---
src/k8s/base/deployment.yml | 8 +++-----
src/k8s/base/kustomization.yml | 1 +
src/k8s/base/service.yml | 7 +++----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/k8s/base/deployment.yml b/src/k8s/base/deployment.yml
index c88d6c83..dbffee0d 100644
--- a/src/k8s/base/deployment.yml
+++ b/src/k8s/base/deployment.yml
@@ -2,18 +2,16 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: submission-code-server-deployment
- namespace: submission-code
labels:
- app: submission-code # do not delete, used for billing
+ app: submission-code
spec:
- revisionHistoryLimit: 1
selector:
matchLabels:
app: submission-code-server
template:
metadata:
labels:
- app: submission-code-server # Bind by service selector>app:
+ app: submission-code-server
spec:
containers:
- name: submission-app
@@ -46,6 +44,6 @@ spec:
- name: SPRING_FLYWAY_BASELINE_VERSION
value: "0"
nodeSelector:
- cce.cloud.com/cce-nodepool: "caascad-inttac-ju-pod-tac-dashing-boa"
+ caascad.io/nodepool: "pod-tac"
imagePullSecrets:
- name: poc-inttac-poc-img-push-pull-secret
diff --git a/src/k8s/base/kustomization.yml b/src/k8s/base/kustomization.yml
index 68074df3..4925c2c0 100644
--- a/src/k8s/base/kustomization.yml
+++ b/src/k8s/base/kustomization.yml
@@ -1,5 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
+namespace: submission-code
resources:
- deployment.yml
- service.yml
diff --git a/src/k8s/base/service.yml b/src/k8s/base/service.yml
index f2ae904d..c836f150 100644
--- a/src/k8s/base/service.yml
+++ b/src/k8s/base/service.yml
@@ -2,13 +2,12 @@ apiVersion: v1
kind: Service
metadata:
labels:
- app: submission-code # do not delete, used for billing
- name: submission-code-server-service # Service name
- namespace: submission-code
+ app: submission-code
+ name: submission-code-server-service
spec:
type: NodePort
selector:
- app: submission-code-server # Defines app that will be targeted
+ app: submission-code-server
ports:
- port: 80
targetPort: 8080
--
GitLab