Merge pull request #2 from nutanix-cloud-native/jimmi/devbox-helm-plugins

build: Use nix based build for helm plugins

Author: dlipovetsky

devbox.json

@@ -22,7 +22,6 @@
     "ko@latest",
     "kubebuilder@latest",
     "kubectl@latest",
-    "kubernetes-helm@latest",
     "kustomize@latest",
     "pre-commit@latest",
     "rsync@latest",
@@ -35,6 +34,7 @@
     "path:./hack/flakes#go-mod-upgrade",
     "path:./hack/flakes#golangci-lint",
     "path:./hack/flakes#goprintconst",
+    "path:./hack/flakes#helm-with-plugins",
     "path:./hack/flakes#release-please",
     "path:./hack/flakes#setup-envtest"
   ],

devbox.lock

@@ -1233,54 +1233,6 @@
         }
       }
     },
-    "kubernetes-helm@latest": {
-      "last_modified": "2024-05-29T10:04:41Z",
-      "resolved": "github:NixOS/nixpkgs/ac82a513e55582291805d6f09d35b6d8b60637a1#kubernetes-helm",
-      "source": "devbox-search",
-      "version": "3.15.1",
-      "systems": {
-        "aarch64-darwin": {
-          "outputs": [
-            {
-              "name": "out",
-              "path": "/nix/store/nipci6fqwxvyz3bcq63mz4svi5bvcpb6-kubernetes-helm-3.15.1",
-              "default": true
-            }
-          ],
-          "store_path": "/nix/store/nipci6fqwxvyz3bcq63mz4svi5bvcpb6-kubernetes-helm-3.15.1"
-        },
-        "aarch64-linux": {
-          "outputs": [
-            {
-              "name": "out",
-              "path": "/nix/store/axp4ixbbbxhg8f630cj6rvxjdjbx99pw-kubernetes-helm-3.15.1",
-              "default": true
-            }
-          ],
-          "store_path": "/nix/store/axp4ixbbbxhg8f630cj6rvxjdjbx99pw-kubernetes-helm-3.15.1"
-        },
-        "x86_64-darwin": {
-          "outputs": [
-            {
-              "name": "out",
-              "path": "/nix/store/rvdcn0nsid05i4ardmvgn38bd1fkk9rw-kubernetes-helm-3.15.1",
-              "default": true
-            }
-          ],
-          "store_path": "/nix/store/rvdcn0nsid05i4ardmvgn38bd1fkk9rw-kubernetes-helm-3.15.1"
-        },
-        "x86_64-linux": {
-          "outputs": [
-            {
-              "name": "out",
-              "path": "/nix/store/i24nairmnj41aq4w6x7fp8wjrcd15i13-kubernetes-helm-3.15.1",
-              "default": true
-            }
-          ],
-          "store_path": "/nix/store/i24nairmnj41aq4w6x7fp8wjrcd15i13-kubernetes-helm-3.15.1"
-        }
-      }
-    },
     "kustomize@latest": {
       "last_modified": "2024-06-08T17:34:36Z",
       "resolved": "github:NixOS/nixpkgs/cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9#kustomize",

hack/flakes/flake.nix

@@ -129,6 +129,44 @@
               "-X ${t}.gitVersion=v${version}"
             ];
           };
+
+          helm-schema = buildGo122Module rec {
+            pname = "helm-schema";
+            version = "1.4.1";
+
+            src = fetchFromGitHub {
+              owner = "losisin";
+              repo = "helm-values-schema-json";
+              rev = "v${version}";
+              hash = "sha256-pi/Xp4t8UFgdFvU2De2Uo/gVsVltan4iSw2XGEtynuw=";
+            };
+            doCheck = false;
+            vendorHash = "sha256-F2mT36aYkLjUZbV5GQH8mNMZjGi/70dTENU2rRhAJq4=";
+            ldflags = let t = "main"; in [
+              "-s"
+              "-w"
+              "-X ${t}.BuildDate=19700101-00:00:00"
+              "-X ${t}.GitCommit=v${version}"
+              "-X ${t}.Version=v${version}"
+            ];
+
+            postPatch = ''
+              sed -i '/^hooks:/,+2 d' plugin.yaml
+              sed -i 's#command: "$HELM_PLUGIN_DIR/schema"#command: "$HELM_PLUGIN_DIR/helm-values-schema-json"#' plugin.yaml
+            '';
+
+            postInstall = ''
+              install -dm755 $out/${pname}
+              mv $out/bin/* $out/${pname}/
+              install -m644 -Dt $out/${pname} plugin.yaml
+            '';
+          };
+
+          helm-with-plugins = wrapHelm kubernetes-helm {
+            plugins = [
+              helm-schema
+            ];
+          };
         };
 
         formatter = alejandra;

make/helm.mk

@@ -1,8 +1,6 @@
 # Copyright 2023 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-HELM_PLUGINS=$(REPO_ROOT)/.local/helm/plugins
-
 .PHONY: lint-chart
 lint-chart: ## Lints helm chart
 lint-chart:
@@ -16,18 +14,7 @@ lint-and-install-chart:
 
 .PHONY: schema-chart
 schema-chart: ## Updates helm values JSON schema
-schema-chart: helm-values-schema-plugin
-	HELM_PLUGINS=$(HELM_PLUGINS) helm schema \
-	--input charts/cluster-api-runtime-extensions-nutanix/values.yaml \
-	--output charts/cluster-api-runtime-extensions-nutanix/values.schema.json
-
-.PHONY: helm-values-schema-plugin
-helm-values-schema-plugin: ## Installs helm-values-schema plugin
-helm-values-schema-plugin:
-	# Only install if plugin not yet installed
-	HELM_PLUGINS=$(HELM_PLUGINS) \
-	helm plugin list | grep --silent "^schema\s" \
-		|| \
-	HELM_PLUGINS=$(HELM_PLUGINS) \
-	helm plugin install \
-	https://github.com/losisin/helm-values-schema-json.git
+schema-chart:
+	helm schema \
+	  --input charts/cluster-api-runtime-extensions-nutanix/values.yaml \
+	  --output charts/cluster-api-runtime-extensions-nutanix/values.schema.json