ajout des fichiers Kubernetes correspondant à ce qui a été envoyé à la DSI

api-deployment.yaml

@@ -1,42 +1,55 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-    kompose.version: 1.26.1 (a9d05d509)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: api
   name: api
 spec:
   replicas: 1
+  revisionHistoryLimit: 3
   selector:
     matchLabels:
-      io.kompose.service: api
+      app: api
-  strategy: {}
   template:
     metadata:
-      annotations:
-        kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-        kompose.version: 1.26.1 (a9d05d509)
-      creationTimestamp: null
       labels:
-        io.kompose.service: api
+        app: api
     spec:
       containers:
-        - env:
+        - name: api
-            - name: DATABASE_HOSTNAME
-              value: db
-            - name: DATABASE_NAME
-            - name: DATABASE_PASSWORD
-            - name: DATABASE_PORT
-              value: "3306"
-            - name: DATABASE_USERNAME
           image: espacecollabbackendapi
-          name: api
+          imagePullPolicy: Always
+          tty: true
+          resources:
+            limits:
+              memory: "512Mi"
+              cpu: "500m"
           ports:
             - containerPort: 80
             - containerPort: 443
-          resources: {}
+          env:
-      restartPolicy: Always
+            - name: DATABASE_HOSTNAME
-status: {}
+              valueFrom:
+                configMapKeyRef:
+                  name: db-config
+                  key: hostname
+            - name: DATABASE_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: db-config
+                  key: port
+            - name: DATABASE_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: db-config
+                  key: name
+            - name: DATABASE_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: db-secret
+                  key: username
+            - name: DATABASE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: db-secret
+                  key: password
+
+

api-ingress-route.yaml

@@ -0,0 +1,13 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: api-http
+spec:
+  entryPoints:
+    - web
+  routes:
+    - match: Host(`localhost`) && PathPrefix(`/api`)
+      kind: Rule
+      services:
+        - name: back
+          port: 80

api-service.yaml

@@ -1,22 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-    kompose.version: 1.26.1 (a9d05d509)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: api
   name: api
 spec:
   ports:
-    - name: "5000"
+    - name: api1
       port: 5000
       targetPort: 80
-    - name: "5001"
+    - name: api2
       port: 5001
       targetPort: 443
   selector:
-    io.kompose.service: api
+    app: api
 status:
   loadBalancer: {}

data-volume-persistentvolumeclaim.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: data-volume
-  name: data-volume
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}

db-config.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: database-config
+data:
+  hostname: db
+  port: "3306"
+  name: collaborateur_epa

db-deployment.yaml

@@ -1,49 +1,56 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-    kompose.version: 1.26.1 (a9d05d509)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: db
   name: db
 spec:
   replicas: 1
+  revisionHistoryLimit: 3
   selector:
     matchLabels:
-      io.kompose.service: db
+      app: db
-  strategy:
-    type: Recreate
   template:
     metadata:
-      annotations:
-        kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-        kompose.version: 1.26.1 (a9d05d509)
-      creationTimestamp: null
       labels:
-        io.kompose.service: db
+        app: db
     spec:
+      volumes:
+        - name: db
+          persistentVolumeClaim:
+            claimName: mysql-pv-claim
       containers:
-        - env:
+        - name: db
-            - name: MYSQL_DATABASE
-            - name: MYSQL_PASSWORD
-            - name: MYSQL_ROOT_PASSWORD
-            - name: MYSQL_USERNAME
           image: mariadb:10.7.1
-          name: db
+          imagePullPolicy: Always
-          resources: {}
+          tty: true
+          resources:
+            limits:
+              memory: "512Mi"
+              cpu: "500m"
+          ports:
+            - name: mariadb
+              containerPort: 3306
           volumeMounts:
-            - mountPath: /var/lib/mysql
+            - name: db
-              name: data-volume
+              mountPath: /var/lib/mysql
-            - mountPath: /docker-entrypoint-initdb.d/init.sql
+
-              name: db-claim1
+          env:
-      restartPolicy: Always
+            - name: MYSQL_ROOT_PASSWORD
-      volumes:
+              valueFrom:
-        - name: data-volume
+                secretKeyRef:
-          persistentVolumeClaim:
+                  name: database-secret
-            claimName: data-volume
+                  key: root-password
-        - name: db-claim1
+            - name: MYSQL_DATABASE
-          persistentVolumeClaim:
+              valueFrom:
-            claimName: db-claim1
+                configMapKeyRef:
-status: {}
+                  name: db-config
+                  key: name
+            - name: MYSQL_USER
+              valueFrom:
+                secretKeyRef:
+                  name: db-secret
+                  key: username
+            - name: MYSQL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: db-secret
+                  key: password

db-secret.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: database-secret
+type: Opaque
+stringData:
+  username: epa-dev
+  password: dev-epa
+  root-password: root

db-service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: db
+  name: db
+spec:
+  ports:
+    - name: mariadb
+      port: 3307
+      targetPort: 3306
+  selector:
+    app: db
+  type: ClusterIP

db-volume.yaml

@@ -1,14 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  creationTimestamp: null
+  name: mysql-pv-claim 
   labels:
-    io.kompose.service: db-claim1
+    app: db
-  name: db-claim1
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Mi
+      storage: 1Gi
-status: {}

docker-compose.yml

@@ -8,6 +8,8 @@ services:
   db:
     image: "mariadb:10.7.1"
     restart: always
+    ports:
+      - "3307:3306"
     environment:
       - MYSQL_DATABASE=${DATABASE_NAME}
       - MYSQL_USERNAME=${APP_DB_USERNAME}
@@ -29,12 +31,12 @@ services:
       - db
     environment:
       - DATABASE_HOSTNAME=db
-      - DATABASE_PORT=3306
+      - DATABASE_PORT=3307
       - DATABASE_NAME=${DATABASE_NAME}
       - DATABASE_USERNAME=${APP_DB_USERNAME}
       - DATABASE_PASSWORD=${APP_DB_PASSWORD}
 
-  
+
   front:
     image: ${DOCKER_REGISTRY-}collab-front
     build:

front-deployment.yaml

@@ -1,33 +1,32 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-    kompose.version: 1.26.1 (a9d05d509)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: front
   name: front
 spec:
   replicas: 1
+  revisionHistoryLimit: 3
   selector:
     matchLabels:
-      io.kompose.service: front
+      app: front
-  strategy: {}
   template:
     metadata:
-      annotations:
-        kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-        kompose.version: 1.26.1 (a9d05d509)
-      creationTimestamp: null
       labels:
-        io.kompose.service: front
+        app: front
     spec:
       containers:
         - image: collab-front
           name: front
+          imagePullPolicy: Always
+          tty: true
+          resources:
+            limits:
+              memory: "256Mi"
+              cpu: "500m"
           ports:
-            - containerPort: 80
+            - name: web
-          resources: {}
+              containerPort: 80
-      restartPolicy: Always
+          env:
-status: {}
+            - name: BASE_URL
+              value: http://localhost/api/
+            - name: LOGOUT_URL
+              value: http://localhost

front-ingress-route.yaml

@@ -0,0 +1,13 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: front-http
+spec:
+  entryPoints:
+    - web
+  routes:
+    - match: Host(`localhost`)
+      kind: Rule
+      services:
+        - name: front
+          port: 80

front-service.yaml

@@ -1,19 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: C:\ProgramData\chocolatey\lib\kubernetes-kompose\tools\kompose.exe convert
-    kompose.version: 1.26.1 (a9d05d509)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: front
   name: front
 spec:
+  selector:
+    app: front
   ports:
-    - name: "8083"
+    - name: web
       port: 8083
       targetPort: 80
-  selector:
+  type: ClusterIP
-    io.kompose.service: front
-status:
-  loadBalancer: {}