fix(dispatcher): dispatcher service must use containerport

fix(dispatcher): liveness probe must use the container port
Container port is 8080 so ... the probes must use the same port
2024-02-13 15:56:10 +01:00 · 2024-02-12 11:46:07 +01:00 · 2024-02-12 11:42:35 +01:00 · 2024-01-30 12:34:54 +01:00 · 2024-01-30 12:27:50 +01:00 · 2024-01-30 12:21:13 +01:00
4 changed files with 43 additions and 45 deletions
--- a/components/hydra-ldap/resources/deployment.yaml
+++ b/components/hydra-ldap/resources/deployment.yaml
@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: hydra-ldap
-  namespace: default
  labels:
    app.kubernetes.io/name: hydra-ldap
    app.kubernetes.io/version: "v1.2.2"
@ -18,34 +17,34 @@ spec:
        app.kubernetes.io/version: "v1.2.2"
    spec:
      containers:
-        - name: werther
-          image: reg.cadoles.com/cadoles/hydra-werther:2023.12.6-stable.1421.15a4717
-          imagePullPolicy: IfNotPresent
-          envFrom:
-            - configMapRef:
-                name: hydra-ldap-env
-          env:
-            - name: WERTHER_WEB_DIR
-              value: "/usr/share/werther/login/"
-            - name: WERTHER_LDAP_BINDDN
-              valueFrom:
-                secretKeyRef:
-                  name: hydra-ldap-sc
-                  key: WERTHER_LDAP_BINDDN
-            - name: WERTHER_LDAP_BINDPW
-              valueFrom:
-                secretKeyRef:
-                  name: hydra-ldap-sc
-                  key: WERTHER_LDAP_BINDPW
-          ports:
-            - containerPort: 8080
-              name: hydra-ldap-http
-          securityContext:
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-                - ALL
-            privileged: false
-            readOnlyRootFilesystem: true
-            runAsNonRoot: true
-            runAsUser: 100
+      - name: werther
+        image: reg.cadoles.com/cadoles/hydra-werther:2023.12.6-stable.1421.15a4717
+        imagePullPolicy: IfNotPresent
+        envFrom:
+        - configMapRef:
+            name: hydra-ldap-env
+        env:
+        - name: WERTHER_WEB_DIR
+          value: "/usr/share/werther/login/"
+        - name: WERTHER_LDAP_BINDDN
+          valueFrom:
+            secretKeyRef:
+              name: hydra-ldap-sc
+              key: WERTHER_LDAP_BINDDN
+        - name: WERTHER_LDAP_BINDPW
+          valueFrom:
+            secretKeyRef:
+              name: hydra-ldap-sc
+              key: WERTHER_LDAP_BINDPW
+        ports:
+        - containerPort: 8080
+          name: hydra-ldap-http
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          privileged: false
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
+          runAsUser: 100
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
@ -49,21 +49,21 @@ spec:
          name: hydra-dispatcher-apps
        resources: {}

-      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
        imagePullPolicy: Always
        name: hydra-dispatcher-nginx
        args: ["/usr/sbin/nginx"]
        readinessProbe:
          httpGet:
            path: /health
-            port: 80
+            port: 8080
          initialDelaySeconds: 5
          timeoutSeconds: 5
          periodSeconds: 10
        livenessProbe:
          httpGet:
            path: /health
-            port: 80
+            port: 8080
          initialDelaySeconds: 15
          timeoutSeconds: 5
          periodSeconds: 15
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
@ -7,7 +7,7 @@ metadata:
 spec:
  ports:
    - name: http
-      port: 80
+      port: 8080
  selector:
    io.kompose.service: hydra-dispatcher
 status:
--- a/resources/hydra/resources/hydra-maester/kustomization.yaml
+++ b/resources/hydra/resources/hydra-maester/kustomization.yaml
@ -2,14 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

 resources:
-  - ./resources/hydra-maester-deployment.yaml
-  - ./resources/hydra-maester-rbac.yaml
-  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
+- ./resources/hydra-maester-deployment.yaml
+- ./resources/hydra-maester-rbac.yaml

 configMapGenerator:
-  - name: hydra-maester-env
-    literals:
-      - APP_ENV=prod
-      - APP_DEBUG=false
-      - HYDRA_ADMIN_BASE_URL=http://hydra
-      - HYDRA_ADMIN_PORT=4445
+- name: hydra-maester-env
+  literals:
+  - APP_ENV=prod
+  - APP_DEBUG=false
+  - HYDRA_ADMIN_BASE_URL=http://hydra
+  - HYDRA_ADMIN_PORT=4445
Author	SHA1	Message	Date
Philippe Caseiro	0084707bbc	fix(dispatcher): dispatcher service must use containerport	2024-02-13 15:56:10 +01:00
Philippe Caseiro	0dbd5dd551	fix(dispatcher): liveness probe must use the container port Container port is 8080 so ... the probes must use the same port	2024-02-12 11:46:07 +01:00
Philippe Caseiro	f1d621d4a9	fix(maester): CRD must be installed cluster wide	2024-02-12 11:42:35 +01:00
Philippe Caseiro	83b81b1056	Revert "fix(resources): do not set namespace in maester rolebinding" This reverts commit `1fccf5f8dc`.	2024-01-30 12:34:54 +01:00
Philippe Caseiro	1fccf5f8dc	fix(resources): do not set namespace in maester rolebinding	2024-01-30 12:27:50 +01:00
Philippe Caseiro	907618902e	fix(resources): oauth2client CRD must be installed clusterwide	2024-01-30 12:21:13 +01:00
Philippe Caseiro	6b1702b7ed	fix(component): do not specify namespace for werther component	2024-01-30 10:42:56 +01:00