chore: dependency conflicts

Signed-off-by: Oliver Bähler <[email protected]>
projectcapsule · Dec 2, 2024 · 438775b · 438775b
1 parent 7736d60
commit 438775b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -46,10 +46,6 @@ jobs:
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: 'go.mod'
-      - uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 # v0.5.0
-        with:
-          skipClusterCreation: true
-          version: v0.14.0
       - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v3
         with:
           version: v3.14.2

diff --git a/.golangci.yml b/.golangci.yml
@@ -35,12 +35,9 @@ linters:
     - depguard
     # should be enabled
     - revive
-    - err113
-    - mnd
     - nilnil
     - wsl
     - perfsprint
-
     # deprecated
     - exportloopref
     - execinquery
diff --git a/charts/capsule-proxy/crds/capsule.clastix.io_globalproxysettings.yaml b/charts/capsule-proxy/crds/capsule.clastix.io_globalproxysettings.yaml
@@ -107,11 +107,13 @@ spec:
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   required:
                                   - key
                                   - operator
                                   type: object
                                 type: array
+                                x-kubernetes-list-type: atomic
                               matchLabels:
                                 additionalProperties:
                                   type: string

diff --git a/charts/capsule-proxy/crds/capsule.clastix.io_proxysettings.yaml b/charts/capsule-proxy/crds/capsule.clastix.io_proxysettings.yaml
@@ -105,11 +105,13 @@ spec:
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   required:
                                   - key
                                   - operator
                                   type: object
                                 type: array
+                                x-kubernetes-list-type: atomic
                               matchLabels:
                                 additionalProperties:
                                   type: string

diff --git a/charts/capsule-proxy/templates/_pod.tpl b/charts/capsule-proxy/templates/_pod.tpl
@@ -83,6 +83,9 @@ spec:
     - name: probe
       containerPort: 8081
       protocol: TCP
+    - name: pprof
+      containerPort: 8082
+      protocol: TCP
     {{- if .Values.livenessProbe.enabled }}
     livenessProbe:
       {{- toYaml (omit .Values.livenessProbe "enabled") | nindent 6 }}

diff --git a/main.go b/main.go
@@ -174,6 +174,7 @@ First match is used and can be specified multiple times as comma separated value
 	mgr, err = ctrl.NewManager(config, ctrl.Options{
 		Scheme:                 scheme,
 		HealthProbeBindAddress: ":8081",
+		PprofBindAddress:       ":8082",
 	})
 	if err != nil {
 		log.Error(err, "cannot create new Manager")