From d0a0dc0f3a643beb9060f61d46a47e46a4c6906c Mon Sep 17 00:00:00 2001 From: cmsassot Date: Wed, 3 Apr 2024 14:47:59 +0200 Subject: [PATCH] test --- .../hydra-oidc/resources/hydra-oidc-deployment.yaml | 7 ++++--- components/hydra-oidc/resources/hydra-oidc-service.yaml | 5 +++-- components/hydra-sql/resources/hydra-sql-deployment.yaml | 7 ++++--- components/hydra-sql/resources/hydra-sql-service.yaml | 3 ++- .../resources/hydra-dispatcher-deployment.yaml | 9 +++++---- .../resources/hydra-dispatcher-service.yaml | 5 +++-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml index a6f1222..377cd0c 100644 --- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml +++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml @@ -66,19 +66,20 @@ spec: readinessProbe: httpGet: path: /healthy - port: 8080 + port: oidc-http-port initialDelaySeconds: 5 timeoutSeconds: 5 periodSeconds: 10 livenessProbe: httpGet: path: /healthy - port: 8080 + port: oidc-http-port initialDelaySeconds: 15 timeoutSeconds: 5 periodSeconds: 15 ports: - - containerPort: 8080 + - name: oidc-http-port + containerPort: 8080 envFrom: - configMapRef: name: hydra-oidc-env diff --git a/components/hydra-oidc/resources/hydra-oidc-service.yaml b/components/hydra-oidc/resources/hydra-oidc-service.yaml index 8cc03d1..1145db4 100644 --- a/components/hydra-oidc/resources/hydra-oidc-service.yaml +++ b/components/hydra-oidc/resources/hydra-oidc-service.yaml @@ -6,8 +6,9 @@ metadata: name: hydra-oidc spec: ports: - - name: hydra-oidc - port: 8080 + - name: hydra-oidc + port: oidc-http-port + targetPort: oidc-http-port selector: app.kubernetes.io/name: hydra-oidc status: diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml index 92e47af..f65830f 100644 --- a/components/hydra-sql/resources/hydra-sql-deployment.yaml +++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml @@ -72,14 +72,14 @@ spec: readinessProbe: httpGet: path: /health - port: 8080 + port: sql-http-port initialDelaySeconds: 5 timeoutSeconds: 5 periodSeconds: 10 livenessProbe: httpGet: path: /health - port: 8080 + port: sql-http-port initialDelaySeconds: 15 timeoutSeconds: 5 periodSeconds: 15 @@ -103,7 +103,8 @@ spec: runAsGroup: 1000 runAsUser: 1000 ports: - - containerPort: 8080 + - name: sql-http-port + containerPort: 8080 volumeMounts: - name: sql-login-config mountPath: "/app/config/sql_login_configuration/sql_login.yaml" diff --git a/components/hydra-sql/resources/hydra-sql-service.yaml b/components/hydra-sql/resources/hydra-sql-service.yaml index b4073c6..0407e05 100644 --- a/components/hydra-sql/resources/hydra-sql-service.yaml +++ b/components/hydra-sql/resources/hydra-sql-service.yaml @@ -7,7 +7,8 @@ metadata: spec: ports: - name: hydra-sql - port: 8080 + port: sql-http-port + targetPort: sql-http-port selector: app.kubernetes.io/name: hydra-sql status: diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml index 1bbdf80..e31bcec 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml @@ -67,14 +67,14 @@ spec: readinessProbe: httpGet: path: /health - port: 80 + port: disp-http-port initialDelaySeconds: 5 timeoutSeconds: 5 periodSeconds: 10 livenessProbe: httpGet: path: /health - port: 80 + port: disp-http-port initialDelaySeconds: 15 timeoutSeconds: 5 periodSeconds: 15 @@ -87,13 +87,14 @@ spec: - name: CADDY_HTTPS_PORT value: "8443" - name: CADDY_HTTP_PORT - value: "80" + value: "8080" - name: CADDY_DATA_FS value: "/tmp/caddy" - name: CADDY_APP_ROOT_PUBLIC value: "/app/public/" ports: - - containerPort: 80 + - name: disp-http-port + containerPort: 8080 resources: {} securityContext: runAsNonRoot: true diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml index 1f8a023..7930b4b 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml @@ -6,8 +6,9 @@ metadata: name: hydra-dispatcher spec: ports: - - name: http - port: 80 + - name: http + port: disp-http-port + targetPort: disp-http-port selector: app.kubernetes.io/name: hydra-dispatcher status: