Merge branch 'main' into dependabot/go_modules/github.com/caddyserver…

…/caddy/v2-2.9.0
caddyserver · Jan 6, 2025 · d5f0788 · d5f0788
2 parents dd49481 + aa8f499
commit d5f0788
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/charts/caddy-ingress-controller/Chart.yaml b/charts/caddy-ingress-controller/Chart.yaml
@@ -4,7 +4,7 @@ home: https://github.com/caddyserver/ingress
 description: A helm chart for the Caddy Kubernetes ingress controller
 icon: https://caddyserver.com/resources/images/caddy-circle-lock.svg
 type: application
-version: 1.2.0
+version: 1.3.0
 appVersion: "v0.2.1"
 keywords:
   - ingress-controller

diff --git a/charts/caddy-ingress-controller/templates/loadbalancer.yaml b/charts/caddy-ingress-controller/templates/loadbalancer.yaml
@@ -10,6 +10,9 @@ metadata:
   {{- end }}
   labels:
     {{- include "caddy-ingress-controller.labels" . | nindent 4 }}
+    {{- with .Values.loadBalancer.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: "LoadBalancer"
   {{- if (semverCompare "<= 1.24.0" .Capabilities.KubeVersion.Version) }}

diff --git a/charts/caddy-ingress-controller/values.schema.json b/charts/caddy-ingress-controller/values.schema.json
@@ -68,6 +68,33 @@
       "$id": "#/properties/fullnameOverride",
       "type": "string"
     },
+    "loadBalancer": {
+      "$id": "#/properties/loadBalancer",
+      "type": "object",
+      "required": [
+        "enabled"
+      ],
+      "properties": {
+        "enabled": {
+          "$id": "#/properties/loadBalancer/properties/enabled",
+          "type": "boolean"
+        },
+        "annotations": {
+          "$id": "#/properties/loadBalancer/properties/annotations",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "labels": {
+          "$id": "#/properties/loadBalancer/properties/labels",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "ingressController": {
       "$id": "#/properties/ingressController",
       "type": "object",

diff --git a/charts/caddy-ingress-controller/values.yaml b/charts/caddy-ingress-controller/values.yaml
@@ -43,12 +43,13 @@ loadBalancer:
   loadBalancerIP:
   # Set to 'Local' to maintain the client's IP on inbound connections
   externalTrafficPolicy:
-  annotations:
+  annotations: {}
     # service.beta.kubernetes.io/aws-load-balancer-type:
     # service.beta.kubernetes.io/aws-load-balancer-nlb-target-type:
     # service.beta.kubernetes.io/aws-load-balancer-scheme:
     # service.beta.kubernetes.io/aws-load-balancer-eip-allocations:
     # service.beta.kubernetes.io/aws-load-balancer-subnets:
+  labels: {}
 
 service:
   # Set to 'Local' to maintain the client's IP on inbound connections

diff --git a/go.sum b/go.sum
@@ -594,7 +594,6 @@ golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto/x509roots/fallback v0.0.0-20241104001025-71ed71b4faf9 h1:4cEcP5+OjGppY79LCQ5Go2B1Boix2x0v6pvA01P3FoA=
 golang.org/x/crypto/x509roots/fallback v0.0.0-20241104001025-71ed71b4faf9/go.mod h1:kNa9WdvYnzFwC79zRpLRMJbdEFlhyM5RPFBBZp/wWH8=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=