Merge branch 'main' into lock-down-egress

defenseunicorns · Sep 10, 2024 · a461cb6 · a461cb6
2 parents 9afa6cd + 1fd8ef3
commit a461cb6
Show file tree

Hide file tree

Showing 13 changed files with 732 additions and 106 deletions.
diff --git a/src/keycloak/chart/templates/service-http.yaml b/src/keycloak/chart/templates/service-http.yaml
@@ -27,5 +27,9 @@ spec:
       port: 8080
       targetPort: http
       protocol: TCP
+    - name: http-metrics
+      port: 9000
+      targetPort: metrics
+      protocol: TCP
   selector:
     {{- include "keycloak.selectorLabels" . | nindent 4 }}
diff --git a/src/keycloak/chart/templates/uds-package.yaml b/src/keycloak/chart/templates/uds-package.yaml
@@ -10,8 +10,8 @@ spec:
         app.kubernetes.io/component: http
       podSelector:
         app.kubernetes.io/name: keycloak
-      targetPort: 8080
-      portName: http
+      targetPort: 9000
+      portName: http-metrics
       description: Metrics
 
   network:

diff --git a/src/keycloak/chart/values.schema.json b/src/keycloak/chart/values.schema.json
@@ -9,17 +9,7 @@
     "additionalGatewayNamespaces": {
       "type": "array",
       "items": {
-        "type": "object",
-        "properties": {
-          "resource": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string"
-              }
-            }
-          }
-        }
+        "type": "string"
       }
     },
     "autoscaling": {

diff --git a/src/pepr/operator/README.md b/src/pepr/operator/README.md
@@ -12,7 +12,7 @@ The UDS Operator manages the lifecycle of UDS Package CRs and their correspondin
 
 #### Exemption
 
-- allowing exemption custom resources only in the `uds-policy-exemptions` namespace unless configured to allow in all namespaces (see [configuring policy exemptions](../../../docs/CONFIGURE_POLICY_EXEMPTIONS.md))
+- allowing exemption custom resources only in the `uds-policy-exemptions` namespace unless configured to allow in all namespaces (see [configuring policy exemptions](../../../docs/configuration/uds-configure-policy-exemptions.md))
 - updating the policies Pepr store with registered exemptions
 
 ### Example UDS Package CR