From f8a5839823fd32295cbdca432bf7345521625d13 Mon Sep 17 00:00:00 2001
From: Johannes Buechele <johannes@bujo.at>
Date: Sun, 25 Jun 2023 09:47:13 +0200
Subject: [PATCH] removed k8s deployment
---
deployments/k8s/base/backend-config-map.yaml | 12 --
deployments/k8s/base/backend-deployment.yaml | 129 ------------------
deployments/k8s/base/backend-service.yaml | 53 -------
deployments/k8s/base/frontend-deployment.yaml | 19 ---
deployments/k8s/base/frontend-service.yaml | 12 --
deployments/k8s/base/kustomization.yaml | 7 -
deployments/k8s/base/postgres.yaml | 20 ---
.../k8s/dev/backend-deployment-patch.yaml | 110 ---------------
deployments/k8s/dev/ingress.yaml | 40 ------
deployments/k8s/dev/kustomization.yaml | 8 --
10 files changed, 410 deletions(-)
delete mode 100644 deployments/k8s/base/backend-config-map.yaml
delete mode 100644 deployments/k8s/base/backend-deployment.yaml
delete mode 100644 deployments/k8s/base/backend-service.yaml
delete mode 100644 deployments/k8s/base/frontend-deployment.yaml
delete mode 100644 deployments/k8s/base/frontend-service.yaml
delete mode 100644 deployments/k8s/base/kustomization.yaml
delete mode 100644 deployments/k8s/base/postgres.yaml
delete mode 100644 deployments/k8s/dev/backend-deployment-patch.yaml
delete mode 100644 deployments/k8s/dev/ingress.yaml
delete mode 100644 deployments/k8s/dev/kustomization.yaml
diff --git a/deployments/k8s/base/backend-config-map.yaml b/deployments/k8s/base/backend-config-map.yaml
deleted file mode 100644
index ef5ea7d..0000000
--- a/deployments/k8s/base/backend-config-map.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: fairregister-config-map
-data:
- SPRING_DATASOURCE_URL: jdbc:postgresql://fairregister-postgres:5432/fairregister
- SPRING_RABBITMQ_HOST: 49.12.218.124
- SPRING_RABBITMQ_PORT: "5672"
- SPRING_JPA_HIBERNATE_DDL_AUTO: update
- MINIO_URL: http://49.12.218.124:9000
- IPFS_HOST: 49.12.218.124
- IPFS_PORT: "5001"
diff --git a/deployments/k8s/base/backend-deployment.yaml b/deployments/k8s/base/backend-deployment.yaml
deleted file mode 100644
index 9447c63..0000000
--- a/deployments/k8s/base/backend-deployment.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: api-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: api-service
- template:
- metadata:
- labels:
- app: api-service
- spec:
- containers:
- - name: api-service
- image: registry.osalliance.com/faircommons/api-service
- command: ["bash", "-c"]
- args: ["source /vault/secrets/config && java -jar ./api-service.jar"]
- resources:
- limits:
- memory: "512Mi"
- cpu: "1000m"
- ports:
- - containerPort: 8080
- env:
- - name: SPRING_DATASOURCE_USERNAME
- valueFrom:
- secretKeyRef:
- key: username
- name: postgres.fairregister-postgres.credentials
- - name: SPRING_DATASOURCE_PASSWORD
- valueFrom:
- secretKeyRef:
- key: password
- name: postgres.fairregister-postgres.credentials
- envFrom:
- - configMapRef:
- name: fairregister-config-map
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: hashing-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: hashing-service
- template:
- metadata:
- labels:
- app: hashing-service
- spec:
- containers:
- - name: hashing-service
- image: registry.osalliance.com/faircommons/hashing-service
- command: ["bash", "-c"]
- args: ["source /vault/secrets/config && java -jar ./hashing-service.jar"]
- resources:
- limits:
- memory: "512Mi"
- cpu: "1000m"
- ports:
- - containerPort: 8081
- envFrom:
- - configMapRef:
- name: fairregister-config-map
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ipfs-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ipfs-service
- template:
- metadata:
- labels:
- app: ipfs-service
- spec:
- containers:
- - name: ipfs-service
- image: registry.osalliance.com/faircommons/ipfs-service
- command: ["bash", "-c"]
- args: ["source /vault/secrets/config && java -jar ./ipfs-service.jar"]
- resources:
- limits:
- memory: "512Mi"
- cpu: "1000m"
- ports:
- - containerPort: 8082
- envFrom:
- - configMapRef:
- name: fairregister-config-map
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: post-registration-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: post-registration-service
- template:
- metadata:
- labels:
- app: post-registration-service
- spec:
- containers:
- - name: post-registration-service
- image: registry.osalliance.com/faircommons/post-registration-service
- command: ["bash", "-c"]
- args: ["source /vault/secrets/config && java -jar ./post-registration-service.jar"]
- resources:
- limits:
- memory: "512Mi"
- cpu: "1000m"
- ports:
- - containerPort: 8083
- envFrom:
- - configMapRef:
- name: fairregister-config-map
diff --git a/deployments/k8s/base/backend-service.yaml b/deployments/k8s/base/backend-service.yaml
deleted file mode 100644
index 3d779a8..0000000
--- a/deployments/k8s/base/backend-service.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: api-service
-spec:
- selector:
- app: api-service
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: hashing-service
-spec:
- selector:
- app: hashing-service
- ports:
- - protocol: TCP
- port: 8081
- targetPort: 8081
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: ipfs-service
-spec:
- selector:
- app: ipfs-service
- ports:
- - protocol: TCP
- port: 8082
- targetPort: 8082
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: post-registration-service
-spec:
- selector:
- app: post-registration-service
- ports:
- - protocol: TCP
- port: 8083
- targetPort: 8083
diff --git a/deployments/k8s/base/frontend-deployment.yaml b/deployments/k8s/base/frontend-deployment.yaml
deleted file mode 100644
index 0b0f547..0000000
--- a/deployments/k8s/base/frontend-deployment.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: frontend-fairregister
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: frontend-fairregister
- template:
- metadata:
- labels:
- app: frontend-fairregister
- spec:
- containers:
- - name: frontend-fairregister
- image: registry.osalliance.com/faircommons/frontend-fairregister
- ports:
- - containerPort: 80
diff --git a/deployments/k8s/base/frontend-service.yaml b/deployments/k8s/base/frontend-service.yaml
deleted file mode 100644
index 4c5d9c2..0000000
--- a/deployments/k8s/base/frontend-service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: frontend-fairregister
-spec:
- selector:
- app: frontend-fairregister
- ports:
- - protocol: TCP
- port: 80
- targetPort: 80
- type: ClusterIP
diff --git a/deployments/k8s/base/kustomization.yaml b/deployments/k8s/base/kustomization.yaml
deleted file mode 100644
index c17b7db..0000000
--- a/deployments/k8s/base/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resources:
- - backend-deployment.yaml
- - backend-config-map.yaml
- - backend-service.yaml
- - frontend-deployment.yaml
- - frontend-service.yaml
- - postgres.yaml
diff --git a/deployments/k8s/base/postgres.yaml b/deployments/k8s/base/postgres.yaml
deleted file mode 100644
index 3ae8ff9..0000000
--- a/deployments/k8s/base/postgres.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: acid.zalan.do/v1
-kind: postgresql
-metadata:
- name: fairregister-postgres
-spec:
- databases:
- fairregister: fairregister
- postgres: postgres
- numberOfInstances: 2
- postgresql:
- version: "14"
- teamId: fairregister
- users:
- fairregister: []
- postgres:
- - superuser
- - createdb
- volume:
- size: 5Gi
- storageClass: rook-ceph-block
diff --git a/deployments/k8s/dev/backend-deployment-patch.yaml b/deployments/k8s/dev/backend-deployment-patch.yaml
deleted file mode 100644
index 09a4130..0000000
--- a/deployments/k8s/dev/backend-deployment-patch.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: api-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: api-service
- template:
- metadata:
- annotations:
- vault.hashicorp.com/agent-inject: "true"
- vault.hashicorp.com/agent-inject-status: "update"
- vault.hashicorp.com/role: 'fairregister-dev'
- vault.hashicorp.com/agent-pre-populate-only: "true"
- vault.hashicorp.com/agent-inject-secret-config: customers/fairkom/dev/fairregister
- vault.hashicorp.com/agent-inject-template-config: |
- {{ with secret "customers/fairkom/dev/fairregister" -}}
- export SPRING_RABBITMQ_USERNAME="{{ .Data.data.rabbit_mq_admin_user }}"
- export SPRING_RABBITMQ_PASSWORD="{{ .Data.data.rabbit_mq_admin_psw }}"
- export MINIO_ACCESS_KEY="{{ .Data.data.minio_access_key }}"
- export MINIO_SECRET_KEY="{{ .Data.data.minio_secret_key }}"
- {{- end }}
- labels:
- app: api-service
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: hashing-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: hashing-service
- template:
- metadata:
- annotations:
- vault.hashicorp.com/agent-inject: "true"
- vault.hashicorp.com/agent-inject-status: "update"
- vault.hashicorp.com/role: 'fairregister-dev'
- vault.hashicorp.com/agent-pre-populate-only: "true"
- vault.hashicorp.com/agent-inject-secret-config: customers/fairkom/dev/fairregister
- vault.hashicorp.com/agent-inject-template-config: |
- {{ with secret "customers/fairkom/dev/fairregister" -}}
- export SPRING_RABBITMQ_USERNAME="{{ .Data.data.rabbit_mq_admin_user }}"
- export SPRING_RABBITMQ_PASSWORD="{{ .Data.data.rabbit_mq_admin_psw }}"
- export MINIO_ACCESS_KEY="{{ .Data.data.minio_access_key }}"
- export MINIO_SECRET_KEY="{{ .Data.data.minio_secret_key }}"
- {{- end }}
- labels:
- app: hashing-service
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ipfs-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ipfs-service
- template:
- metadata:
- annotations:
- vault.hashicorp.com/agent-inject: "true"
- vault.hashicorp.com/agent-inject-status: "update"
- vault.hashicorp.com/role: 'fairregister-dev'
- vault.hashicorp.com/agent-pre-populate-only: "true"
- vault.hashicorp.com/agent-inject-secret-config: customers/fairkom/dev/fairregister
- vault.hashicorp.com/agent-inject-template-config: |
- {{ with secret "customers/fairkom/dev/fairregister" -}}
- export SPRING_RABBITMQ_USERNAME="{{ .Data.data.rabbit_mq_admin_user }}"
- export SPRING_RABBITMQ_PASSWORD="{{ .Data.data.rabbit_mq_admin_psw }}"
- export MINIO_ACCESS_KEY="{{ .Data.data.minio_access_key }}"
- export MINIO_SECRET_KEY="{{ .Data.data.minio_secret_key }}"
- {{- end }}
- labels:
- app: ipfs-service
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: post-registration-service
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: post-registration-service
- template:
- metadata:
- annotations:
- vault.hashicorp.com/agent-inject: "true"
- vault.hashicorp.com/agent-inject-status: "update"
- vault.hashicorp.com/role: 'fairregister-dev'
- vault.hashicorp.com/agent-pre-populate-only: "true"
- vault.hashicorp.com/agent-inject-secret-config: customers/fairkom/dev/fairregister
- vault.hashicorp.com/agent-inject-template-config: |
- {{ with secret "customers/fairkom/dev/fairregister" -}}
- export SPRING_RABBITMQ_USERNAME="{{ .Data.data.rabbit_mq_admin_user }}"
- export SPRING_RABBITMQ_PASSWORD="{{ .Data.data.rabbit_mq_admin_psw }}"
- export MINIO_ACCESS_KEY="{{ .Data.data.minio_access_key }}"
- export MINIO_SECRET_KEY="{{ .Data.data.minio_secret_key }}"
- {{- end }}
- labels:
- app: post-registration-service
diff --git a/deployments/k8s/dev/ingress.yaml b/deployments/k8s/dev/ingress.yaml
deleted file mode 100644
index a2f4cc8..0000000
--- a/deployments/k8s/dev/ingress.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: fairregister-dev
- labels:
- app: fairregister-dev
- annotations:
- cert-manager.io/issuer: letsencrypt-prod
- nginx.ingress.kubernetes.io/enable-cors: "true"
- nginx.ingress.kubernetes.io/cors-allow-origin: "*"
- nginx.ingress.kubernetes.io/cors-allow-methods: "*"
- nginx.ingress.kubernetes.io/cors-allow-headers: "*"
-spec:
- rules:
- - host: dev.fairregister.net
- http:
- paths:
- - backend:
- service:
- name: frontend-fairregister
- port:
- number: 80
- path: /
- pathType: ImplementationSpecific
- - host: api.dev.fairregister.net
- http:
- paths:
- - backend:
- service:
- name: api-service
- port:
- number: 8080
- path: /
- pathType: ImplementationSpecific
- tls:
- - hosts:
- - dev.fairregister.net
- - api.dev.fairregister.net
- secretName: dev-fairregister-net
-
diff --git a/deployments/k8s/dev/kustomization.yaml b/deployments/k8s/dev/kustomization.yaml
deleted file mode 100644
index 0e7d0fa..0000000
--- a/deployments/k8s/dev/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace: fairregister-dev
-
-resources:
-- ../base
-- ingress.yaml
-
-patchesStrategicMerge:
-- backend-deployment-patch.yaml
--
GitLab