fix: add working podmonitor for sidekiq

chart/templates/sidekiq-pod-monitor.yaml

@@ -0,0 +1,20 @@
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: gitlab-sidekiq-metrics
+  namespace: {{ .Release.Namespace }}
+spec:
+  scrapeClass: istio-certs
+  namespaceSelector:
+    matchNames:
+    - gitlab
+  podMetricsEndpoints:
+  - path: /metrics
+    port: http-metrics
+    scheme: https
+    enableHttp2: false
+  selector:
+    matchLabels:
+      app: sidekiq
+{{- end }}

chart/templates/uds-package.yaml

@@ -187,6 +187,15 @@ spec:
         port: 9235
         description: "Pages Service Monitor"
 
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: sidekiq
+        port: 3807
+        description: "Sidekiq Pod Monitor"
+
       - direction: Egress
         selector:
           app: registry

tasks.yaml

@@ -2,11 +2,11 @@ includes:
   - cleanup: ./tasks/cleanup.yaml
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/create.yaml
-  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/lint.yaml
-  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/pull.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/deploy.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/setup.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/create.yaml
+  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/lint.yaml
+  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/pull.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/setup.yaml
 
 tasks:
   - name: default
@@ -51,7 +51,10 @@ tasks:
     description: Test the GitLab package from the current branch
     actions:
       - task: create-gl-test-bundle
-      - task: setup:k3d-test-cluster
+      - task: setup:k3d-full-cluster
+      # - cmd: ./uds zarf package deploy oci://defenseunicorns/uds-k3d:0.7.0 --set=K3D_IMAGE="rancher/k3s:v1.29.5-k3s1" --confirm --no-progress
+      # - cmd: ./uds zarf package deploy oci://defenseunicorns/init:v0.35.0 --confirm --no-progress
+      # - cmd: ./uds zarf package deploy oci://defenseunicorns/packages/private/uds/snapshots/core:latest-unicorn --confirm --no-progress
       - task: deploy:test-bundle
       - task: setup:create-doug-user
       - task: test:all

tasks/publish.yaml

@@ -1,10 +1,10 @@
 includes:
   - dependencies: ./dependencies.yaml
   - test: ./test.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/create.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/deploy.yaml
-  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/publish.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/setup.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/create.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/deploy.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/publish.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/setup.yaml
 
 tasks:
   - name: build-package

tests/auth.setup.ts

@@ -5,7 +5,7 @@ setup('authenticate', async ({ page, context }) => {
   await page.goto('/dashboard/projects');
 
   await page.getByLabel('Username or email').fill('doug');
-  await page.getByLabel('Password').fill('unicorn123!@#');
+  await page.getByLabel('Password').fill('unicorn123!@#UN');
   await page.getByRole('button', { name: "Log In" }).click();
 
   await page.waitForURL('/dashboard/projects');  // successful redirect

values/common-values.yaml

@@ -142,8 +142,8 @@ gitlab:
   sidekiq:
     metrics:
       enabled: true
-      serviceMonitor:
-        enabled: true
+      podMonitor:
+        enabled: false
 
   webservice:
     ingress: