cosmetic(oidc-test): rename CM oidc-test to oidc-test-env

Reviewed-on: #2

components/hydra-cnpg-database/kustomization.yaml

@@ -29,7 +29,7 @@ vars:
   fieldref:
     fieldpath: metadata.name
 
-patches:
+patchesJson6902:
 - target:
     group: apps
     version: v1
@@ -42,9 +42,3 @@ patches:
     kind: Job
     name: hydra-migrate
   path: patches/hydra-migrate-job.yaml
-- target:
-    group: batch
-    version: v1
-    kind: CronJob
-    name: hydra-janitor
-  path: patches/hydra-janitor-cronjob.yaml

components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml

@@ -1,21 +0,0 @@
-- op: add
-  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
-  value:
-    name: HYDRA_DATABASE_USER
-    valueFrom:
-      secretKeyRef:
-        name: hydra-postgres-user
-        key: username
-- op: add
-  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
-  value:
-    name: HYDRA_DATABASE_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: hydra-postgres-user
-        key: password
-- op: add
-  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
-  value:
-    name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"

components/oidc-test/kustomization.yaml

@@ -7,7 +7,7 @@ resources:
   - ./resources/oauth2-client.yaml
 
 configMapGenerator:
-  - name: oidc-test
+  - name: oidc-test-env
     literals:
       - LOG_LEVEL=0
       - HTTP_ADDRESS=0.0.0.0:8080

components/oidc-test/resources/deployment.yaml

@@ -24,7 +24,7 @@ spec:
           resources: {}
           envFrom:
           - configMapRef:
-              name: oidc-test
+              name: oidc-test-env
           env:
           - name: OIDC_CLIENT_ID
             valueFrom:

examples/authenticated-app/kustomization.yaml

@@ -2,12 +2,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../overlays/full
+  - ../../overlays/base
   - ./resources/ingress.yaml
   - ./resources/saml-idp.yaml
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
+components:
+  - ../../components/hydra-cnpg-database
+  - ../../components/oidc-test
+  #- ../../components/hydra-oidc
+  - ../../components/hydra-saml
+
+
 patchesJson6902:
   - target:
       version: v1
@@ -31,7 +38,7 @@ patchesJson6902:
     path: patches/hydra-secret.yaml
   - target:
       version: v1
-      kind: ConfigMap
+      kind: Secret
       name: oidc-test
     path: patches/oidc-test.yaml
   - target:

examples/authenticated-app/patches/oidc-test-oauth2-client.yaml

@@ -3,4 +3,4 @@
   value: https://ssokustom/oauth2/callback
 - op: replace
   path: "/spec/postLogoutRedirectUris/0"
-  value: https://ssokustom
+  value: https://ssokustom/oauth2/callback

examples/authenticated-app/patches/oidc-test.yaml

@@ -1,3 +1,6 @@
+- op: replace
+  path: "/data/LOG_LEVEL"
+  value: 0
 - op: replace
   path: "/data/OIDC_REDIRECT_URL"
   value: https://ssokustom/oauth2/callback

kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- ./overlays/base

overlays/full/kustomization.yaml

@@ -13,5 +13,4 @@ components:
 - ../../components/hydra-cnpg-database
 - ../../components/hydra-oidc
 - ../../components/hydra-saml
-- ../../components/hydra-sql
-- ../../components/oidc-test
+- ../../components/hydra-sql

resources/hydra/kustomization.yaml

@@ -9,8 +9,6 @@ resources:
   - ./resources/hydra-serviceaccount.yaml
   - ./resources/hydra-migrate-job.yaml
   - ./resources/hydra-maester
-  - ./resources/hydra-janitor-cronjob.yaml
-  - ./resources/hydra-hpa.yaml
 
 secretGenerator:
   - name: hydra-secret

resources/hydra/resources/hydra-deployment.yaml

@@ -55,9 +55,6 @@ spec:
               name: hydra-public
             - containerPort: 4445
               name: hydra-admin
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi
+          resources: {}
       restartPolicy: Always
   

resources/hydra/resources/hydra-hpa.yaml

@@ -1,26 +0,0 @@
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: hydra
-  labels:
-    io.kompose.service: hydra
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: hydra
-  minReplicas: 1
-  maxReplicas: 3
-  metrics:
-  - type: Resource
-    resource:
-      name: memory
-      target:
-        type: Utilization
-        averageUtilization: 80
-  - type: Resource
-    resource:
-      name: cpu
-      target:
-        type: Utilization
-        averageUtilization: 80

resources/hydra/resources/hydra-janitor-cronjob.yaml

@@ -1,34 +0,0 @@
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: hydra-janitor
-  labels:
-    app.kubernetes.io/name: hydra-janitor
-spec:
-  concurrencyPolicy: Forbid
-  schedule: "0 */1 * * *"
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/name: hydra-janitor
-        spec:
-          restartPolicy: OnFailure
-          serviceAccountName: hydra-sa
-          containers:
-            - name: janitor
-              image: reg.cadoles.com/proxy_cache/oryd/hydra:v2.0.3
-              envFrom:
-              - configMapRef:
-                  name: hydra-env
-              imagePullPolicy: IfNotPresent
-              command: ["hydra"]
-              env: []
-              args:
-                - janitor
-                - --read-from-env
-                - --grants
-                - --requests
-                - --tokens
-              resources: {}