Browse Source

chore(deps): bump golang from 1.24.5 to 1.24.6 and helm-values-schema-json plugin to `2.2.1` (#5126)

* chore(deps): bump golang from 1.24.5 to 1.24.6

Signed-off-by: Jakob Möller <jakob.moeller@sap.com>

* chore(deps): pin helm schema plugin to v1.9.2 to avoid breaking changes

Signed-off-by: Jakob Möller <jakob.moeller@sap.com>

* chore(deps): bump helm-schema to v2.2.1

properly bumps helm schema plugin to 2.2.1 and actually uses the correct flags that were previously failing

Signed-off-by: Jakob Möller <jakob.moeller@sap.com>

* chore(deps): bump helm-schema to v2.2.1

properly bumps helm schema plugin to 2.2.1 and actually uses the correct flags that were previously failing

Signed-off-by: Jakob Möller <jakob.moeller@sap.com>

---------

Signed-off-by: Jakob Möller <jakob.moeller@sap.com>
Jakob Möller 8 months ago
parent
commit
a25afa4385
7 changed files with 138 additions and 175 deletions
  1. 1 1
      Dockerfile.standalone
  2. 2 2
      Makefile
  3. 131 168
      deploy/charts/external-secrets/values.schema.json
  4. 1 1
      e2e/Dockerfile
  5. 1 1
      e2e/go.mod
  6. 1 1
      go.mod
  7. 1 1
      tilt.debug.dockerfile

+ 1 - 1
Dockerfile.standalone

@@ -1,6 +1,6 @@
 # This version of Dockerfile is for building without external dependencies.
 # Build a multi-platform image e.g. `docker buildx build --push --platform linux/arm64,linux/amd64 --tag external-secrets:dev --file Dockerfile.standalone .`
-FROM golang:1.24.5-alpine@sha256:daae04ebad0c21149979cd8e9db38f565ecefd8547cf4a591240dc1972cf1399 AS builder
+FROM golang:1.24.6-alpine@sha256:c8c5f95d64aa79b6547f3b626eb84b16a7ce18a139e3e9ca19a8c078b85ba80d AS builder
 # Add metadata
 LABEL maintainer="cncf-externalsecretsop-maintainers@lists.cncf.io" \
       description="External Secrets Operator is a Kubernetes operator that integrates external secret management systems"

+ 2 - 2
Makefile

@@ -191,12 +191,12 @@ helm.build: helm.generate ## Build helm chart
 
 helm.schema.plugin:
 	@$(INFO) Installing helm-values-schema-json plugin
-	@helm plugin install https://github.com/losisin/helm-values-schema-json.git || true
+	@helm plugin install --version v2.2.1 https://github.com/losisin/helm-values-schema-json.git || true
 	@$(OK) Installed helm-values-schema-json plugin
 
 helm.schema.update: helm.schema.plugin
 	@$(INFO) Generating values.schema.json
-	@helm schema -input $(HELM_DIR)/values.yaml -output $(HELM_DIR)/values.schema.json
+	@helm schema --values $(HELM_DIR)/values.yaml --output $(HELM_DIR)/values.schema.json
 	@$(OK) Generated values.schema.json
 
 helm.generate:

+ 131 - 168
deploy/charts/external-secrets/values.schema.json

@@ -1,11 +1,12 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "type": "object",
     "properties": {
         "affinity": {
-            "properties": {},
             "type": "object"
         },
         "bitwarden-sdk-server": {
+            "type": "object",
             "properties": {
                 "enabled": {
                     "type": "boolean"
@@ -13,24 +14,21 @@
                 "namespaceOverride": {
                     "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "certController": {
+            "type": "object",
             "properties": {
                 "affinity": {
-                    "properties": {},
                     "type": "object"
                 },
                 "create": {
                     "type": "boolean"
                 },
                 "deploymentAnnotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "extraArgs": {
-                    "properties": {},
                     "type": "object"
                 },
                 "extraEnv": {
@@ -52,6 +50,7 @@
                     "type": "boolean"
                 },
                 "image": {
+                    "type": "object",
                     "properties": {
                         "flavour": {
                             "type": "string"
@@ -65,13 +64,13 @@
                         "tag": {
                             "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "imagePullSecrets": {
                     "type": "array"
                 },
                 "log": {
+                    "type": "object",
                     "properties": {
                         "level": {
                             "type": "string"
@@ -79,23 +78,23 @@
                         "timeEncoding": {
                             "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "metrics": {
+                    "type": "object",
                     "properties": {
                         "listen": {
+                            "type": "object",
                             "properties": {
                                 "port": {
                                     "type": "integer"
                                 }
-                            },
-                            "type": "object"
+                            }
                         },
                         "service": {
+                            "type": "object",
                             "properties": {
                                 "annotations": {
-                                    "properties": {},
                                     "type": "object"
                                 },
                                 "enabled": {
@@ -104,28 +103,21 @@
                                 "port": {
                                     "type": "integer"
                                 }
-                            },
-                            "type": "object"
+                            }
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "nameOverride": {
                     "type": "string"
                 },
                 "nodeSelector": {
-                    "properties": {},
                     "type": "object"
                 },
                 "podAnnotations": {
-                    "properties": {},
-                    "type": "object"
-                },
-                "strategy": {
-                    "properties": {},
                     "type": "object"
                 },
                 "podDisruptionBudget": {
+                    "type": "object",
                     "properties": {
                         "enabled": {
                             "type": "boolean"
@@ -135,34 +127,36 @@
                                 "integer",
                                 "string"
                             ]
+                        },
+                        "nameOverride": {
+                            "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "podLabels": {
-                    "properties": {},
                     "type": "object"
                 },
                 "podSecurityContext": {
+                    "type": "object",
                     "properties": {
                         "enabled": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "priorityClassName": {
                     "type": "string"
                 },
                 "rbac": {
+                    "type": "object",
                     "properties": {
                         "create": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "readinessProbe": {
+                    "type": "object",
                     "properties": {
                         "address": {
                             "type": "string"
@@ -170,8 +164,7 @@
                         "port": {
                             "type": "integer"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "replicaCount": {
                     "type": "integer"
@@ -180,27 +173,27 @@
                     "type": "string"
                 },
                 "resources": {
-                    "properties": {},
                     "type": "object"
                 },
                 "revisionHistoryLimit": {
                     "type": "integer"
                 },
                 "securityContext": {
+                    "type": "object",
                     "properties": {
                         "allowPrivilegeEscalation": {
                             "type": "boolean"
                         },
                         "capabilities": {
+                            "type": "object",
                             "properties": {
                                 "drop": {
+                                    "type": "array",
                                     "items": {
                                         "type": "string"
-                                    },
-                                    "type": "array"
+                                    }
                                 }
-                            },
-                            "type": "object"
+                            }
                         },
                         "enabled": {
                             "type": "boolean"
@@ -215,20 +208,19 @@
                             "type": "integer"
                         },
                         "seccompProfile": {
+                            "type": "object",
                             "properties": {
                                 "type": {
                                     "type": "string"
                                 }
-                            },
-                            "type": "object"
+                            }
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "serviceAccount": {
+                    "type": "object",
                     "properties": {
                         "annotations": {
-                            "properties": {},
                             "type": "object"
                         },
                         "automount": {
@@ -238,13 +230,14 @@
                             "type": "boolean"
                         },
                         "extraLabels": {
-                            "properties": {},
                             "type": "object"
                         },
                         "name": {
                             "type": "string"
                         }
-                    },
+                    }
+                },
+                "strategy": {
                     "type": "object"
                 },
                 "tolerations": {
@@ -253,11 +246,9 @@
                 "topologySpreadConstraints": {
                     "type": "array"
                 }
-            },
-            "type": "object"
+            }
         },
         "commonLabels": {
-            "properties": {},
             "type": "object"
         },
         "concurrent": {
@@ -267,18 +258,18 @@
             "type": "string"
         },
         "crds": {
+            "type": "object",
             "properties": {
                 "annotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "conversion": {
+                    "type": "object",
                     "properties": {
                         "enabled": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "createClusterExternalSecret": {
                     "type": "boolean"
@@ -295,18 +286,15 @@
                 "createPushSecret": {
                     "type": "boolean"
                 }
-            },
-            "type": "object"
+            }
         },
         "createOperator": {
             "type": "boolean"
         },
         "deploymentAnnotations": {
-            "properties": {},
             "type": "object"
         },
         "dnsConfig": {
-            "properties": {},
             "type": "object"
         },
         "dnsPolicy": {
@@ -316,16 +304,11 @@
             "type": "boolean"
         },
         "extraArgs": {
-            "properties": {},
             "type": "object"
         },
         "extraContainers": {
             "type": "array"
         },
-        "strategy": {
-            "properties": {},
-            "type": "object"
-        },
         "extraEnv": {
             "type": "array"
         },
@@ -345,26 +328,25 @@
             "type": "string"
         },
         "global": {
+            "type": "object",
             "properties": {
                 "affinity": {
-                    "properties": {},
                     "type": "object"
                 },
                 "compatibility": {
+                    "type": "object",
                     "properties": {
                         "openshift": {
+                            "type": "object",
                             "properties": {
                                 "adaptSecurityContext": {
                                     "type": "string"
                                 }
-                            },
-                            "type": "object"
+                            }
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "nodeSelector": {
-                    "properties": {},
                     "type": "object"
                 },
                 "tolerations": {
@@ -373,13 +355,12 @@
                 "topologySpreadConstraints": {
                     "type": "array"
                 }
-            },
-            "type": "object"
+            }
         },
         "grafanaDashboard": {
+            "type": "object",
             "properties": {
                 "annotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "enabled": {
@@ -391,13 +372,13 @@
                 "sidecarLabelValue": {
                     "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "hostNetwork": {
             "type": "boolean"
         },
         "image": {
+            "type": "object",
             "properties": {
                 "flavour": {
                     "type": "string"
@@ -411,8 +392,7 @@
                 "tag": {
                     "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "imagePullSecrets": {
             "type": "array"
@@ -424,6 +404,7 @@
             "type": "boolean"
         },
         "log": {
+            "type": "object",
             "properties": {
                 "level": {
                     "type": "string"
@@ -431,23 +412,23 @@
                 "timeEncoding": {
                     "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "metrics": {
+            "type": "object",
             "properties": {
                 "listen": {
+                    "type": "object",
                     "properties": {
                         "port": {
                             "type": "integer"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "service": {
+                    "type": "object",
                     "properties": {
                         "annotations": {
-                            "properties": {},
                             "type": "object"
                         },
                         "enabled": {
@@ -456,11 +437,9 @@
                         "port": {
                             "type": "integer"
                         }
-                    },
-                    "type": "object"
+                    }
                 }
-            },
-            "type": "object"
+            }
         },
         "nameOverride": {
             "type": "string"
@@ -469,17 +448,16 @@
             "type": "string"
         },
         "nodeSelector": {
-            "properties": {},
             "type": "object"
         },
         "openshiftFinalizers": {
             "type": "boolean"
         },
         "podAnnotations": {
-            "properties": {},
             "type": "object"
         },
         "podDisruptionBudget": {
+            "type": "object",
             "properties": {
                 "enabled": {
                     "type": "boolean"
@@ -489,24 +467,24 @@
                         "integer",
                         "string"
                     ]
+                },
+                "nameOverride": {
+                    "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "podLabels": {
-            "properties": {},
             "type": "object"
         },
         "podSecurityContext": {
+            "type": "object",
             "properties": {
                 "enabled": {
                     "type": "boolean"
                 }
-            },
-            "type": "object"
+            }
         },
         "podSpecExtra": {
-            "properties": {},
             "type": "object"
         },
         "priorityClassName": {
@@ -525,6 +503,7 @@
             "type": "boolean"
         },
         "rbac": {
+            "type": "object",
             "properties": {
                 "aggregateToEdit": {
                     "type": "boolean"
@@ -536,21 +515,19 @@
                     "type": "boolean"
                 },
                 "servicebindings": {
+                    "type": "object",
                     "properties": {
                         "create": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 }
-            },
-            "type": "object"
+            }
         },
         "replicaCount": {
             "type": "integer"
         },
         "resources": {
-            "properties": {},
             "type": "object"
         },
         "revisionHistoryLimit": {
@@ -563,20 +540,21 @@
             "type": "boolean"
         },
         "securityContext": {
+            "type": "object",
             "properties": {
                 "allowPrivilegeEscalation": {
                     "type": "boolean"
                 },
                 "capabilities": {
+                    "type": "object",
                     "properties": {
                         "drop": {
+                            "type": "array",
                             "items": {
                                 "type": "string"
-                            },
-                            "type": "array"
+                            }
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "enabled": {
                     "type": "boolean"
@@ -591,17 +569,17 @@
                     "type": "integer"
                 },
                 "seccompProfile": {
+                    "type": "object",
                     "properties": {
                         "type": {
                             "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 }
-            },
-            "type": "object"
+            }
         },
         "service": {
+            "type": "object",
             "properties": {
                 "ipFamilies": {
                     "type": "array"
@@ -609,13 +587,12 @@
                 "ipFamilyPolicy": {
                     "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "serviceAccount": {
+            "type": "object",
             "properties": {
                 "annotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "automount": {
@@ -625,19 +602,17 @@
                     "type": "boolean"
                 },
                 "extraLabels": {
-                    "properties": {},
                     "type": "object"
                 },
                 "name": {
                     "type": "string"
                 }
-            },
-            "type": "object"
+            }
         },
         "serviceMonitor": {
+            "type": "object",
             "properties": {
                 "additionalLabels": {
-                    "properties": {},
                     "type": "object"
                 },
                 "enabled": {
@@ -661,7 +636,9 @@
                 "scrapeTimeout": {
                     "type": "string"
                 }
-            },
+            }
+        },
+        "strategy": {
             "type": "object"
         },
         "tolerations": {
@@ -671,13 +648,12 @@
             "type": "array"
         },
         "webhook": {
+            "type": "object",
             "properties": {
                 "affinity": {
-                    "properties": {},
                     "type": "object"
                 },
                 "annotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "certCheckInterval": {
@@ -687,14 +663,15 @@
                     "type": "string"
                 },
                 "certManager": {
+                    "type": "object",
                     "properties": {
                         "addInjectorAnnotations": {
                             "type": "boolean"
                         },
                         "cert": {
+                            "type": "object",
                             "properties": {
                                 "annotations": {
-                                    "properties": {},
                                     "type": "object"
                                 },
                                 "create": {
@@ -704,6 +681,7 @@
                                     "type": "string"
                                 },
                                 "issuerRef": {
+                                    "type": "object",
                                     "properties": {
                                         "group": {
                                             "type": "string"
@@ -714,8 +692,7 @@
                                         "name": {
                                             "type": "string"
                                         }
-                                    },
-                                    "type": "object"
+                                    }
                                 },
                                 "renewBefore": {
                                     "type": "string"
@@ -723,24 +700,20 @@
                                 "revisionHistoryLimit": {
                                     "type": "integer"
                                 }
-                            },
-                            "type": "object"
+                            }
                         },
                         "enabled": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "create": {
                     "type": "boolean"
                 },
                 "deploymentAnnotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "extraArgs": {
-                    "properties": {},
                     "type": "object"
                 },
                 "extraEnv": {
@@ -765,6 +738,7 @@
                     "type": "boolean"
                 },
                 "image": {
+                    "type": "object",
                     "properties": {
                         "flavour": {
                             "type": "string"
@@ -778,13 +752,13 @@
                         "tag": {
                             "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "imagePullSecrets": {
                     "type": "array"
                 },
                 "log": {
+                    "type": "object",
                     "properties": {
                         "level": {
                             "type": "string"
@@ -792,26 +766,26 @@
                         "timeEncoding": {
                             "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "lookaheadInterval": {
                     "type": "string"
                 },
                 "metrics": {
+                    "type": "object",
                     "properties": {
                         "listen": {
+                            "type": "object",
                             "properties": {
                                 "port": {
                                     "type": "integer"
                                 }
-                            },
-                            "type": "object"
+                            }
                         },
                         "service": {
+                            "type": "object",
                             "properties": {
                                 "annotations": {
-                                    "properties": {},
                                     "type": "object"
                                 },
                                 "enabled": {
@@ -820,28 +794,21 @@
                                 "port": {
                                     "type": "integer"
                                 }
-                            },
-                            "type": "object"
+                            }
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "nameOverride": {
                     "type": "string"
                 },
                 "nodeSelector": {
-                    "properties": {},
                     "type": "object"
                 },
                 "podAnnotations": {
-                    "properties": {},
-                    "type": "object"
-                },
-                "strategy": {
-                    "properties": {},
                     "type": "object"
                 },
                 "podDisruptionBudget": {
+                    "type": "object",
                     "properties": {
                         "enabled": {
                             "type": "boolean"
@@ -851,21 +818,22 @@
                                 "integer",
                                 "string"
                             ]
+                        },
+                        "nameOverride": {
+                            "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "podLabels": {
-                    "properties": {},
                     "type": "object"
                 },
                 "podSecurityContext": {
+                    "type": "object",
                     "properties": {
                         "enabled": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "port": {
                     "type": "integer"
@@ -874,14 +842,15 @@
                     "type": "string"
                 },
                 "rbac": {
+                    "type": "object",
                     "properties": {
                         "create": {
                             "type": "boolean"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "readinessProbe": {
+                    "type": "object",
                     "properties": {
                         "address": {
                             "type": "string"
@@ -889,38 +858,36 @@
                         "port": {
                             "type": "integer"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "replicaCount": {
                     "type": "integer"
                 },
                 "resources": {
-                    "properties": {},
                     "type": "object"
                 },
                 "revisionHistoryLimit": {
                     "type": "integer"
                 },
                 "secretAnnotations": {
-                    "properties": {},
                     "type": "object"
                 },
                 "securityContext": {
+                    "type": "object",
                     "properties": {
                         "allowPrivilegeEscalation": {
                             "type": "boolean"
                         },
                         "capabilities": {
+                            "type": "object",
                             "properties": {
                                 "drop": {
+                                    "type": "array",
                                     "items": {
                                         "type": "string"
-                                    },
-                                    "type": "array"
+                                    }
                                 }
-                            },
-                            "type": "object"
+                            }
                         },
                         "enabled": {
                             "type": "boolean"
@@ -935,27 +902,25 @@
                             "type": "integer"
                         },
                         "seccompProfile": {
+                            "type": "object",
                             "properties": {
                                 "type": {
                                     "type": "string"
                                 }
-                            },
-                            "type": "object"
+                            }
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "service": {
+                    "type": "object",
                     "properties": {
                         "annotations": {
-                            "properties": {},
                             "type": "object"
                         },
                         "enabled": {
                             "type": "boolean"
                         },
                         "labels": {
-                            "properties": {},
                             "type": "object"
                         },
                         "loadBalancerIP": {
@@ -964,13 +929,12 @@
                         "type": {
                             "type": "string"
                         }
-                    },
-                    "type": "object"
+                    }
                 },
                 "serviceAccount": {
+                    "type": "object",
                     "properties": {
                         "annotations": {
-                            "properties": {},
                             "type": "object"
                         },
                         "automount": {
@@ -980,13 +944,14 @@
                             "type": "boolean"
                         },
                         "extraLabels": {
-                            "properties": {},
                             "type": "object"
                         },
                         "name": {
                             "type": "string"
                         }
-                    },
+                    }
+                },
+                "strategy": {
                     "type": "object"
                 },
                 "tolerations": {
@@ -995,9 +960,7 @@
                 "topologySpreadConstraints": {
                     "type": "array"
                 }
-            },
-            "type": "object"
+            }
         }
-    },
-    "type": "object"
+    }
 }

+ 1 - 1
e2e/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bookworm@sha256:ef8c5c733079ac219c77edab604c425d748c740d8699530ea6aced9de79aea40 AS builder
+FROM golang:1.24.6-bookworm@sha256:ef8c5c733079ac219c77edab604c425d748c740d8699530ea6aced9de79aea40 AS builder
 
 ENV KUBECTL_VERSION="v1.28.3"
 ENV HELM_VERSION="v3.13.1"

+ 1 - 1
e2e/go.mod

@@ -1,6 +1,6 @@
 module github.com/external-secrets/external-secrets-e2e
 
-go 1.24.4
+go 1.24.6
 
 replace (
 	github.com/Masterminds/sprig/v3 => github.com/external-secrets/sprig/v3 v3.3.0

+ 1 - 1
go.mod

@@ -1,6 +1,6 @@
 module github.com/external-secrets/external-secrets
 
-go 1.24.4
+go 1.24.6
 
 replace github.com/Masterminds/sprig/v3 => github.com/external-secrets/sprig/v3 v3.3.0
 

+ 1 - 1
tilt.debug.dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24.5@sha256:ef5b4be1f94b36c90385abd9b6b4f201723ae28e71acacb76d00687333c17282
+FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6
 WORKDIR /
 COPY ./bin/external-secrets /external-secrets