From 56167d29ac5fbcb48da9bccecbcdf1361d22b015 Mon Sep 17 00:00:00 2001
From: Laszlo Rafael <rlacko99@gmail.com>
Date: Thu, 10 Feb 2022 17:54:19 +0100
Subject: [PATCH] Please work

---
 .gitlab-ci.yml     | 10 ++++++----
 k8s/deployment.yml |  8 ++++----
 k8s/pvc.yaml       | 30 ++++++++++++++++++++++++++++++
 k8s/service.yml    |  2 +-
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 k8s/pvc.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c05aa2..7361667 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ image: python:3.9
 
 variables:
   POSTGRES_DB: kszkepzes
-  CONTAINER_IMAGE: 'registry.kszk.bme.hu/kszk/devteam/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME'
+  CONTAINER_IMAGE: 'harbor.sch.bme.hu/kszk/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME'
 
 cache:
   key: '$CI_JOB_NAME-$CI_COMMIT_REF_SLUG'
@@ -60,21 +60,23 @@ Docker build to KSZK registry:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: ['']
   script:
-    - echo "{\"auths\":{\"registry.kszk.bme.hu\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - echo "{\"auths\":{\"harbor.sch.bme.hu\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CONTAINER_IMAGE
 
 Deploy to Kubernetes:
   stage: deploy
   image: alpine
-  tags: [devteam]
+  tags: [kszk]
   environment:
     name: master
-  script:
+  before_script:
+    - chmod 600 $KUBECONFIG
     - apk add --no-cache curl
     - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
     - chmod +x ./kubectl
     - mv ./kubectl /usr/local/bin/kubectl
     - kubectl version
+  script:
     - cd k8s
     - sed -i "s|##IMAGETAG##|${CI_COMMIT_REF_NAME}|" deployment.yml
     # A kovetkezo ket sor egy undorito workaround a mindig valtozo init kontenerek miatt letrejovo es beakado replicasetek miatt. Pls replace, ha van jobb otlet.
diff --git a/k8s/deployment.yml b/k8s/deployment.yml
index 5cd1c9d..97bc236 100644
--- a/k8s/deployment.yml
+++ b/k8s/deployment.yml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: apache-static
-  namespace: devteam-kszk-bme-hu
+  namespace: kszk-kepzes-site
 spec:
   replicas: 1
   selector:
@@ -22,7 +22,7 @@ spec:
             - name: kszkepzes-static-volume
               mountPath: /staticfiles
         - name: kszkepzes-backend-collectstatic
-          image: registry.kszk.bme.hu/kszk/devteam/kszkepzes-backend:##IMAGETAG##
+          image: harbor.sch.bme.hu/kszk/kszkepzes-backend:##IMAGETAG##
           imagePullPolicy: 'Always'
           command: ['python', 'manage.py', 'collectstatic', '--noinput']
           volumeMounts:
@@ -53,13 +53,13 @@ spec:
           persistentVolumeClaim:
             claimName: kszkepzes-static-pv-claim
       imagePullSecrets:
-        - name: kszkepzes-regcred
+        - name: harbor
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kszkepzes-backend
-  namespace: devteam-kszk-bme-hu
+  namespace: kszk-kepzes-site
 spec:
   replicas: 1
   selector:
diff --git a/k8s/pvc.yaml b/k8s/pvc.yaml
new file mode 100644
index 0000000..f314143
--- /dev/null
+++ b/k8s/pvc.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    app: kszkepzes
+  name: kszkepzes-media-pv-claim
+  namespace: kszk-kepzes-site
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+  storageClassName: vsphere
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    app: kszkepzes
+  name: kszkepzes-static-pv-claim
+  namespace: kszk-kepzes-site
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: vsphere
diff --git a/k8s/service.yml b/k8s/service.yml
index 9bb1dd0..2770606 100644
--- a/k8s/service.yml
+++ b/k8s/service.yml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: kszkepzes-backend
-  namespace: devteam-kszk-bme-hu
+  namespace: kszk-kepzes-site
 spec:
   type: ClusterIP
   ports:
-- 
GitLab