Fix bitwarden-sdk labels and selectors

lentzi90 · Feb 14, 2025 · cff93c6 · cff93c6
1 parent 1a8cd2f
commit cff93c6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/kind-deploy.yaml b/.github/workflows/kind-deploy.yaml
@@ -15,6 +15,8 @@ jobs:
       uses: kyverno/action-install-chainsaw@v0.2.12
     - name: Create Kind Cluster
       uses: helm/kind-action@v1.12.0
+      with:
+        config: kind-config.yaml
 
     - name: Chainsaw test
       run: chainsaw test

diff --git a/apps/kind/kustomization.yaml b/apps/kind/kustomization.yaml
@@ -4,8 +4,7 @@ kind: Kustomization
 namespace: argocd
 
 resources:
-# We cannot apply the app of apps when testing a PR, since it would make all the other apps point to main
-# - apps-app.yaml
+- apps-app.yaml
 - argocd-app.yaml
 - cert-manager-app.yaml
 - cloudnative-pg-app.yaml
@@ -18,9 +17,3 @@ resources:
 - nextcloud-app.yaml
 - pi-hole-app.yaml
 - wireguard-app.yaml
-# In order to test PRs, patch the targetRevision
-# patches:
-# - target:
-#     version: v1alpha1
-#     kind: Application
-#   patch: pr-patch.yaml
diff --git a/apps/kind/pr-patch.yaml b/apps/kind/pr-patch.yaml
diff --git a/external-secrets/components/bitwarden-sdk-server/certificate.yaml b/external-secrets/components/bitwarden-sdk-server/certificate.yaml
@@ -2,6 +2,8 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: bitwarden-sdk-server
+  labels:
+    app.kubernetes.io/name: bitwarden-sdk-server
 spec:
   secretName: bitwarden-tls-certs
   issuerRef:

diff --git a/external-secrets/components/bitwarden-sdk-server/deployment.yaml b/external-secrets/components/bitwarden-sdk-server/deployment.yaml
@@ -3,9 +3,17 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: bitwarden-sdk-server
+  labels:
+    app.kubernetes.io/name: bitwarden-sdk-server
 spec:
+  selector:
+    labels:
+      app.kubernetes.io/name: bitwarden-sdk-server
   replicas: 1
   template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: bitwarden-sdk-server
     spec:
       serviceAccountName: bitwarden-sdk-server
       securityContext: {}

diff --git a/external-secrets/components/bitwarden-sdk-server/kustomization.yaml b/external-secrets/components/bitwarden-sdk-server/kustomization.yaml
@@ -1,9 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
-labels:
-- includeSelectors: true
-  pairs:
-    app.kubernetes.io/name: bitwarden-sdk-server
 resources:
 - deployment.yaml
 - service.yaml

diff --git a/external-secrets/components/bitwarden-sdk-server/serviceaccount.yaml b/external-secrets/components/bitwarden-sdk-server/serviceaccount.yaml
@@ -2,3 +2,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: bitwarden-sdk-server
+  labels:
+    app.kubernetes.io/name: bitwarden-sdk-server