Re-enable serviceMonitors

Signed-off-by: Nicolas Bigler <[email protected]>
vshn · Aug 6, 2024 · c80d514 · c80d514
1 parent fabdc9c
commit c80d514
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/package/crossplane.yaml b/package/crossplane.yaml
@@ -4,6 +4,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  image: ghcr.io/vshn/appcat:latest
+  image: ghcr.io/vshn/appcat:keycloak_svc_monitor
   crossplane:
     version: ">=1.14.0"
diff --git a/pkg/comp-functions/functions/vshnkeycloak/deploy.go b/pkg/comp-functions/functions/vshnkeycloak/deploy.go
@@ -218,7 +218,7 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 		{
 			"name": "JAVA_OPTS_APPEND",
 			"value": `-Djava.awt.headless=true
--Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless`,
+-Djgroups.dns.query={{ include "keycloak.full§name" . }}-headless`,
 		},
 		{
 			"name":  "KC_HTTPS_CERTIFICATE_FILE",
@@ -324,8 +324,6 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 			"/opt/keycloak/bin/kc-with-setup.sh",
 			"--verbose",
 			"start",
-			"--http-enabled=true",
-			"--http-port=8080",
 			"--hostname-strict=false",
 			"--spi-events-listener-jboss-logging-success-level=info",
 			"--spi-events-listener-jboss-logging-error-level=warn",
@@ -344,10 +342,10 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 			"enabled": true,
 		},
 		"extraServiceMonitor": map[string]any{
-			"enabled": false,
+			"enabled": true,
 		},
 		"serviceMonitor": map[string]any{
-			"enabled": false,
+			"enabled": true,
 		},
 		"resources": map[string]any{
 			"requests": map[string]any{
@@ -390,7 +388,6 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 		},
 		"http": map[string]any{
 			"relativePath": comp.Spec.Parameters.Service.RelativePath,
-			//	"internalPort": "http-internal",
 		},
 		"podSecurityContext": nil,
 	}