Change deploymentconfigs

Deploymentconfigs are deprecated and cause some issues when deploying the pattern. There is a workaround that is needed for the db password to not contain special characters due to some bug in the python container.
validatedpatterns · Jan 15, 2025 · 5adc0de · 5adc0de
1 parent b899fb4
commit 5adc0de
Show file tree

Hide file tree

Showing 9 changed files with 191 additions and 194 deletions.
diff --git a/charts/all/kafdrop/templates/kafdrop.yaml b/charts/all/kafdrop/templates/kafdrop.yaml
@@ -1,11 +1,12 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ .Values.kafka.app }}
   namespace: {{ .Values.global.xraylab.namespace }}
 spec:
   selector:
-    app: {{ .Values.kafka.app }}
+    matchLabels:
+      app: {{ .Values.kafka.app }}
   replicas: {{ .Values.kafka.deployment.replicas }}
   template:
     metadata:

diff --git a/.../database/templates/deploymentconfig.yaml → ...sis/database/templates/db-deployment.yaml b/.../database/templates/deploymentconfig.yaml → ...sis/database/templates/db-deployment.yaml
@@ -17,8 +17,8 @@ spec:
   storageClassName: {{ .Values.global.datacenter.storageClassName }}
   volumeMode: Filesystem
 ---
-kind: DeploymentConfig
-apiVersion: apps.openshift.io/v1
+kind: Deployment
+apiVersion: apps/v1
 metadata:
   name: {{ .Values.database.name }}
   namespace: "{{ .Values.global.xraylab.namespace }}"
@@ -30,17 +30,11 @@ metadata:
 spec:
   strategy:
     type: Recreate
-    recreateParams:
-      timeoutSeconds: 600
-    resources: {}
-    activeDeadlineSeconds: 21600
-  triggers:
-    - type: ConfigChange
   replicas: 1
   revisionHistoryLimit: 3
-  test: false
   selector:
-    app: {{ .Values.database.name }}
+    matchLabels:
+      app: {{ .Values.database.name }}
   template:
     metadata:
       labels:

diff --git a/charts/all/medical-diagnosis/image-generator/templates/image-gen-deployment.yaml b/charts/all/medical-diagnosis/image-generator/templates/image-gen-deployment.yaml
@@ -0,0 +1,87 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
+    argocd.argoproj.io/sync-wave: '5'
+  name: image-generator
+  namespace: {{ .Values.global.xraylab.namespace }}
+spec:
+  replicas: 0
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: image-generator
+  template:
+    metadata:
+      labels:
+        app: image-generator
+    spec:
+      containers:
+      - env:
+        - name: SECONDS_WAIT
+          value: '10'
+        - name: AWS_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              key: AWS_ACCESS_KEY_ID
+              name: s3-secret-bck
+        - name: AWS_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              key: AWS_SECRET_ACCESS_KEY
+              name: s3-secret-bck
+        - name: SERVICE_POINT
+          valueFrom:
+            configMapKeyRef:
+              key: url
+              name: service-point
+        - name: DATABASE_USER
+          valueFrom:
+            secretKeyRef:
+              key: database-user
+              name: db-secret
+        - name: DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: database-password
+              name: db-secret
+        - name: DATABASE_HOST
+          valueFrom:
+            secretKeyRef:
+              key: database-host
+              name: db-secret
+        - name: DATABASE_DB
+          valueFrom:
+            secretKeyRef:
+              key: database-db
+              name: db-secret
+        - name: BUCKET_BASE_NAME
+          valueFrom:
+            configMapKeyRef:
+              key: bucket-base-name
+              name: buckets-config
+        - name: BUCKET_SOURCE
+          valueFrom:
+            configMapKeyRef:
+              key: bucket-source
+              name: buckets-config
+        image: image-generator:latest
+        imagePullPolicy: IfNotPresent
+        name: image-generator
+        resources:
+          limits:
+            cpu: '2'
+            memory: 1G
+          requests:
+            cpu: 400m
+            memory: 100M
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+
diff --git a/charts/all/medical-diagnosis/image-generator/templates/image-generator-dc.yaml b/charts/all/medical-diagnosis/image-generator/templates/image-generator-dc.yaml
diff --git a/charts/all/medical-diagnosis/image-server/templates/image-server-dc.yaml b/charts/all/medical-diagnosis/image-server/templates/image-server-dc.yaml
diff --git a/charts/all/medical-diagnosis/image-server/templates/image-server-deployment.yaml b/charts/all/medical-diagnosis/image-server/templates/image-server-deployment.yaml
@@ -0,0 +1,73 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
+    argocd.argoproj.io/sync-wave: '10'
+  name: image-server
+  namespace: '{{ .Values.global.xraylab.namespace }}'
+spec:
+  replicas: 1
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: image-server
+  template:
+    metadata:
+      labels:
+        app: image-server
+    spec:
+      containers:
+      - env:
+        - name: database-user
+          valueFrom:
+            secretKeyRef:
+              key: database-user
+              name: db-secret
+        - name: database-password
+          valueFrom:
+            secretKeyRef:
+              key: database-password
+              name: db-secret
+        - name: database-host
+          valueFrom:
+            secretKeyRef:
+              key: database-host
+              name: db-secret
+        - name: database-db
+          valueFrom:
+            secretKeyRef:
+              key: database-db
+              name: db-secret
+        - name: service_point
+          valueFrom:
+            configMapKeyRef:
+              key: url-external
+              name: service-point
+        - name: bucket-base-name
+          valueFrom:
+            configMapKeyRef:
+              key: bucket-base-name
+              name: buckets-config
+        image: image-server:latest
+        imagePullPolicy: IfNotPresent
+        name: image-server
+        ports:
+        - containerPort: 5000
+          protocol: TCP
+        resources:
+          limits:
+            cpu: '2'
+            memory: 1G
+          requests:
+            cpu: 400m
+            memory: 100M
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+
diff --git a/charts/all/medical-diagnosis/image-server/templates/image-server-svc.yaml b/charts/all/medical-diagnosis/image-server/templates/image-server-svc.yaml
@@ -11,4 +11,4 @@ spec:
       port: 80
       targetPort: 5000
   selector:
-    name: image-server
+    app: image-server