components/hydra-saml/resources/hydra-saml-service.yaml

@@ -6,9 +6,9 @@ metadata:
   name: hydra-saml
 spec:
   ports:
-  - name: hydra-saml
-    port: 80
+    - name: hydra-saml-shibboleth-sp
+      port: 80
   selector:
-    io.kompose.service: hydra-saml
+    io.kompose.service: hydra-saml-shibboleth-sp
 status:
   loadBalancer: {}

components/hydra-saml/resources/hydra-saml-shibboleth-sp-deployment.yaml

@@ -2,28 +2,28 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-saml
-  name: hydra-saml
+    io.kompose.service: hydra-saml-shibboleth-sp
+  name: hydra-saml-shibboleth-sp
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-saml
+      io.kompose.service: hydra-saml-shibboleth-sp
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-saml
+        io.kompose.service: hydra-saml-shibboleth-sp
     spec:
       containers:
-      - name: hydra-saml
-        image: reg.cadoles.com/cadoles/shibboleth-sp-v3:v0.0.0-172-g0f44679
-        envFrom:
-        - configMapRef:
-            name: hydra-saml-env
-        ports:
-        - containerPort: 80
-        resources: {}
+        - name: hydra-saml-shibboleth-sp
+          image: reg.cadoles.com/cadoles/shibboleth-sp-v3:v0.0.0-172-g0f44679
+          envFrom:
+            - configMapRef:
+                name: hydra-saml-env
+          ports:
+            - containerPort: 80
+          resources: {}
       restartPolicy: Always
             

components/hydra-sql/files/sql_login.yaml

@@ -1,7 +0,0 @@
-sql_login:
-  login_column_name: mail
-  password_column_name: password
-  salt_column_name: salt
-  table_name: user
-  data_to_fetch:
-  - mail

components/hydra-sql/kustomization.yaml

@@ -1,23 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
-kind: Component
-
-resources:
-- ./resources/hydra-sql-service.yaml
-- ./resources/hydra-sql-deployment.yaml
-
-configMapGenerator:
-- name: hydra-sql-env
-  literals:
-  - ISSUER_URL="http://localhost:8000"
-  - BASE_URL='http://localhost:8080'
-  - HYDRA_ADMIN_BASE_URL='http://hydra:4445/admin'
-  - APP_LOCALES="fr,en"
-  - HASH_ALGO_LEGACY="sha256, bcrypt"
-  - SECURITY_PATTERN="password,salt,pepper"
-  - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
-  - DB_USER="makeMeASecret"
-  - DB_PASSWORD="makeMeASecret"
-  - PEPPER="MakeMeABigSecret"
-- name: sql-login-config
-  files:
-  - ./files/sql_login.yaml

components/hydra-sql/resources/hydra-sql-deployment.yaml

@@ -1,100 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: hydra-sql
-  name: hydra-sql
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: hydra-sql
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        io.kompose.service: hydra-sql
-    spec:
-      containers:
-      - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
-        imagePullPolicy: Always
-        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-        readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - test -f /etc/php81/php-fpm.d/www.conf
-        livenessProbe:
-          exec:
-            command:
-            - php
-            - bin/console
-            - -V
-          initialDelaySeconds: 10
-          periodSeconds: 30
-        resources: {}
-        envFrom:
-        - configMapRef:
-            name: hydra-sql-env
-        env:
-        - name: PHP_FPM_LISTEN
-          value: 127.0.0.1:9000
-        - name: PHP_MEMORY_LIMIT
-          value: 128m
-        - name: PHP_FPM_MEMORY_LIMIT
-          value: 128m
-        - name: PHP_FPM_LOG_LEVEL
-          value: warning
-        volumeMounts:
-        - name: sql-login-config
-          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-          subPath: "sql_login.yaml"
-
-      - name: hydra-sql-nginx
-        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
-        imagePullPolicy: Always
-        args: ["/usr/sbin/nginx"]
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 5
-          timeoutSeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 15
-          timeoutSeconds: 5
-          periodSeconds: 15
-        envFrom:
-        - configMapRef:
-            name: hydra-sql-env
-        env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
-          value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
-          value: "/public"
-        - name: NGINX_APP_PHP_INDEX
-          value: "/index.php"
-        - name: NGINX_ERROR_LOG_LEVEL
-          value: "warn"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "^/index\\.php(/|$)"
-        resources: {}
-        ports:
-        - containerPort: 8080
-        volumeMounts:
-        - name: sql-login-config
-          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-          subPath: "sql_login.yaml"
-      volumes:
-      - name: sql-login-config
-        configMap:
-          name: sql-login-config
-
-      restartPolicy: Always

components/hydra-sql/resources/hydra-sql-service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: hydra-sql
-  name: hydra-sql
-spec:
-  ports:
-  - name: hydra-sql
-    port: 8080
-  selector:
-    io.kompose.service: hydra-sql
-status:
-  loadBalancer: {}

kustomization.yaml

@@ -9,4 +9,3 @@ components:
 - ./components/hydra-cnpg-database
 - ./components/hydra-oidc
 - ./components/hydra-saml
-- ./components/hydra-sql