fix(oidc-tester): fix oauth secret keys

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,16 +24,16 @@ spec:
         resources: {}
         envFrom:
         - configMapRef:
-              name: oidc-test
+            name: oidc-test-env
         env:
         - name: OIDC_CLIENT_ID
           valueFrom:
             secretKeyRef:
               name: oidc-test-oauth2-client
-                key: client_id
+              key: CLIENT_ID
         - name: OIDC_CLIENT_SECRET
           valueFrom:
             secretKeyRef:
               name: oidc-test-oauth2-client
-                key: client_secret
+              key: CLIENT_SECRET
       restartPolicy: Always

resources/hydra/kustomization.yaml

@@ -10,7 +10,6 @@ resources:
   - ./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-maester/kustomization.yaml

@@ -4,7 +4,7 @@ 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
+#- https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
 
 configMapGenerator:
 - name: hydra-maester-env

resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml

@@ -1,4 +1,3 @@
----
 # Source: hydra/charts/hydra-maester/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -7,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: hydra-maester
     app.kubernetes.io/instance: hydra-master
-    app.kubernetes.io/version: "v0.0.23"
+    app.kubernetes.io/version: "v0.0.32"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -26,7 +25,7 @@ spec:
     spec:
       containers:
       - name: hydra-maester
-          image: reg.cadoles.com/proxy_cache/oryd/hydra-maester:v0.0.25
+        image: reg.cadoles.com/proxy_cache/oryd/hydra-maester:v0.0.32-amd64
         imagePullPolicy: IfNotPresent
         envFrom:
         - configMapRef:
@@ -38,8 +37,7 @@ spec:
         - --hydra-url=$(HYDRA_ADMIN_BASE_URL)
         - --hydra-port=$(HYDRA_ADMIN_PORT)
         - --endpoint=/admin/clients
-          resources:
-            {}
+        resources: {}
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         securityContext: