hack: Replace go workspace with replace (#21094)
Using go workspace breaks iso build, and may affect the builds in unwanted ways, bringing dependencies from the hack module into the minikube module. Remove the go.work file and add a replace directive to the hack module, so it can access minikube packages from the local directory. Some programs working directory was the source directory. With this change all programs and scripts in the hack module are run from the hack directory. Paths updated to the programs can find files in the minikube root directory. Some updaters and benchmarks are broken in master and are still broken with this change. These updates fail to pull non-existing images: - make update-istio-operator-version - make update-amd-gpu-device-plugin-version These try to install try to install in /usr/local/bin with sudo and neede rewrite: - make cpu-benchmark-idle - make cpu-benchmark-autopause - make time-to-k8s-benchmarkpull/21056/merge
Nir Soffer
GitHub
parent
516e3ef367
commit
6a779426fe
102
Makefile
102
Makefile
|
|
@ -560,7 +560,7 @@ verify-iso: # Make sure the current ISO exists in the expected bucket
|
|||
gsutil stat gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-arm64.iso
|
||||
|
||||
out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants")
|
||||
go run -ldflags="$(MINIKUBE_LDFLAGS)" -tags gendocs hack/help_text/gen_help_text.go
|
||||
cd hack && go run -ldflags="$(MINIKUBE_LDFLAGS)" -tags gendocs help_text/gen_help_text.go
|
||||
|
||||
.PHONY: debs ## Build all deb packages
|
||||
debs: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \
|
||||
|
|
@ -772,7 +772,7 @@ endif
|
|||
docker buildx build -f ./deploy/kicbase/Dockerfile --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --push --build-arg VERSION_JSON=$(VERSION_JSON) --build-arg COMMIT_SHA=${VERSION}-$(COMMIT_NOQUOTES) --build-arg PREBUILT_AUTO_PAUSE=true .
|
||||
|
||||
out/preload-tool:
|
||||
go build -ldflags="$(MINIKUBE_LDFLAGS)" -o $@ ./hack/preload-images/*.go
|
||||
cd hack && go build -ldflags="$(MINIKUBE_LDFLAGS)" -o ../$@ preload-images/*.go
|
||||
|
||||
.PHONY: upload-preloaded-images-tar
|
||||
upload-preloaded-images-tar: out/minikube out/preload-tool ## Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
|
||||
|
|
@ -1009,7 +1009,7 @@ out/performance-bot:
|
|||
|
||||
.PHONY: out/metrics-collector
|
||||
out/metrics-collector:
|
||||
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ hack/metrics/*.go
|
||||
cd hack && GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o ../$@ metrics/*.go
|
||||
|
||||
|
||||
.PHONY: compare
|
||||
|
|
@ -1036,23 +1036,23 @@ help:
|
|||
|
||||
.PHONY: update-golang-version
|
||||
update-golang-version:
|
||||
go run hack/update/golang_version/update_golang_version.go
|
||||
cd hack && go run update/golang_version/update_golang_version.go
|
||||
|
||||
.PHONY: update-kubernetes-version
|
||||
update-kubernetes-version:
|
||||
go run hack/update/kubernetes_version/update_kubernetes_version.go
|
||||
cd hack && go run update/kubernetes_version/update_kubernetes_version.go
|
||||
|
||||
.PHONY: update-golint-version
|
||||
update-golint-version:
|
||||
go run hack/update/golint_version/update_golint_version.go
|
||||
cd hack && go run update/golint_version/update_golint_version.go
|
||||
|
||||
.PHONY: update-preload-version
|
||||
update-preload-version:
|
||||
go run hack/update/preload_version/update_preload_version.go
|
||||
cd hack && go run update/preload_version/update_preload_version.go
|
||||
|
||||
.PHONY: update-kubeadm-constants
|
||||
update-kubeadm-constants:
|
||||
go run hack/update/kubeadm_constants/update_kubeadm_constants.go
|
||||
cd hack && go run update/kubeadm_constants/update_kubeadm_constants.go
|
||||
gofmt -w pkg/minikube/constants/constants_kubeadm_images.go
|
||||
|
||||
.PHONY: stress
|
||||
|
|
@ -1073,173 +1073,173 @@ time-to-k8s-benchmark:
|
|||
|
||||
.PHONY: update-gopogh-version
|
||||
update-gopogh-version: ## update gopogh version
|
||||
go run hack/update/gopogh_version/update_gopogh_version.go
|
||||
cd hack && go run update/gopogh_version/update_gopogh_version.go
|
||||
|
||||
.PHONY: update-gotestsum-version
|
||||
update-gotestsum-version:
|
||||
go run hack/update/gotestsum_version/update_gotestsum_version.go
|
||||
cd hack && go run update/gotestsum_version/update_gotestsum_version.go
|
||||
|
||||
.PHONY: update-gh-version
|
||||
update-gh-version:
|
||||
go run hack/update/gh_version/update_gh_version.go
|
||||
cd hack && go run update/gh_version/update_gh_version.go
|
||||
|
||||
.PHONY: update-docsy-version
|
||||
update-docsy-version:
|
||||
go run hack/update/docsy_version/update_docsy_version.go
|
||||
cd hack && go run update/docsy_version/update_docsy_version.go
|
||||
|
||||
.PHONY: update-hugo-version
|
||||
update-hugo-version:
|
||||
go run hack/update/hugo_version/update_hugo_version.go
|
||||
cd hack && go run update/hugo_version/update_hugo_version.go
|
||||
|
||||
.PHONY: update-cloud-spanner-emulator-version
|
||||
update-cloud-spanner-emulator-version:
|
||||
go run hack/update/cloud_spanner_emulator_version/update_cloud_spanner_emulator_version.go
|
||||
cd hack && go run update/cloud_spanner_emulator_version/update_cloud_spanner_emulator_version.go
|
||||
|
||||
.PHONY: update-containerd-version
|
||||
update-containerd-version:
|
||||
go run hack/update/containerd_version/update_containerd_version.go
|
||||
cd hack && go run update/containerd_version/update_containerd_version.go
|
||||
|
||||
.PHONY: update-buildkit-version
|
||||
update-buildkit-version:
|
||||
go run hack/update/buildkit_version/update_buildkit_version.go
|
||||
cd hack && go run update/buildkit_version/update_buildkit_version.go
|
||||
|
||||
.PHONY: update-cri-o-version
|
||||
update-cri-o-version:
|
||||
go run hack/update/cri-o_version/update_cri-o_version.go
|
||||
cd hack && go run update/cri-o_version/update_cri-o_version.go
|
||||
|
||||
.PHONY: update-crun-version
|
||||
update-crun-version:
|
||||
go run hack/update/crun_version/update_crun_version.go
|
||||
cd hack && go run update/crun_version/update_crun_version.go
|
||||
|
||||
.PHONY: update-metrics-server-version
|
||||
update-metrics-server-version:
|
||||
go run hack/update/metrics_server_version/update_metrics_server_version.go
|
||||
cd hack && go run update/metrics_server_version/update_metrics_server_version.go
|
||||
|
||||
.PHONY: update-runc-version
|
||||
update-runc-version:
|
||||
go run hack/update/runc_version/update_runc_version.go
|
||||
cd hack && go run update/runc_version/update_runc_version.go
|
||||
|
||||
.PHONY: update-docker-version
|
||||
update-docker-version:
|
||||
go run hack/update/docker_version/update_docker_version.go
|
||||
cd hack && go run update/docker_version/update_docker_version.go
|
||||
|
||||
.PHONY: update-ubuntu-version
|
||||
update-ubuntu-version:
|
||||
go run hack/update/ubuntu_version/update_ubuntu_version.go)
|
||||
cd hack && go run update/ubuntu_version/update_ubuntu_version.go
|
||||
|
||||
.PHONY: update-cni-plugins-version
|
||||
update-cni-plugins-version:
|
||||
go run hack/update/cni_plugins_version/update_cni_plugins_version.go
|
||||
cd hack && go run update/cni_plugins_version/update_cni_plugins_version.go
|
||||
|
||||
.PHONY: update-gcp-auth-version
|
||||
update-gcp-auth-version:
|
||||
go run hack/update/gcp_auth_version/update_gcp_auth_version.go
|
||||
cd hack && go run update/gcp_auth_version/update_gcp_auth_version.go
|
||||
|
||||
.PHONY: update-kubernetes-versions-list
|
||||
update-kubernetes-versions-list:
|
||||
go run hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go
|
||||
cd hack && go run update/kubernetes_versions_list/update_kubernetes_versions_list.go
|
||||
|
||||
.PHONY: update-ingress-version
|
||||
update-ingress-version:
|
||||
go run hack/update/ingress_version/update_ingress_version.go
|
||||
cd hack && go run update/ingress_version/update_ingress_version.go
|
||||
|
||||
.PHONY: update-flannel-version
|
||||
update-flannel-version:
|
||||
go run hack/update/flannel_version/update_flannel_version.go
|
||||
cd hack && go run update/flannel_version/update_flannel_version.go
|
||||
|
||||
.PHONY: update-inspektor-gadget-version
|
||||
update-inspektor-gadget-version:
|
||||
go run hack/update/inspektor_gadget_version/update_inspektor_gadget_version.go
|
||||
cd hack && go run update/inspektor_gadget_version/update_inspektor_gadget_version.go
|
||||
|
||||
.PHONY: update-calico-version
|
||||
update-calico-version:
|
||||
go run hack/update/calico_version/update_calico_version.go
|
||||
cd hack && go run update/calico_version/update_calico_version.go
|
||||
|
||||
.PHONY: update-cri-dockerd-version
|
||||
update-cri-dockerd-version:
|
||||
go run hack/update/cri_dockerd_version/update_cri_dockerd_version.go
|
||||
cd hack && go run update/cri_dockerd_version/update_cri_dockerd_version.go
|
||||
|
||||
.PHONY: update-go-github-version
|
||||
update-go-github-version:
|
||||
go run hack/update/go_github_version/update_go_github_version.go
|
||||
cd hack && go run update/go_github_version/update_go_github_version.go
|
||||
|
||||
.PHONY: update-docker-buildx-version
|
||||
update-docker-buildx-version:
|
||||
go run hack/update/docker_buildx_version/update_docker_buildx_version.go
|
||||
cd hack && go run update/docker_buildx_version/update_docker_buildx_version.go
|
||||
|
||||
.PHONY: update-nerdctl-version
|
||||
update-nerdctl-version:
|
||||
go run hack/update/nerdctl_version/update_nerdctl_version.go
|
||||
cd hack && go run update/nerdctl_version/update_nerdctl_version.go
|
||||
|
||||
.PHONY: update-crictl-version
|
||||
update-crictl-version:
|
||||
go run hack/update/crictl_version/update_crictl_version.go
|
||||
cd hack && go run update/crictl_version/update_crictl_version.go
|
||||
|
||||
.PHONY: update-kindnetd-version
|
||||
update-kindnetd-version:
|
||||
go run hack/update/kindnetd_version/update_kindnetd_version.go
|
||||
cd hack && go run update/kindnetd_version/update_kindnetd_version.go
|
||||
|
||||
.PHONY: update-istio-operator-version
|
||||
update-istio-operator-version:
|
||||
go run hack/update/istio_operator_version/update_istio_operator_version.go
|
||||
cd hack && go run update/istio_operator_version/update_istio_operator_version.go
|
||||
|
||||
.PHONY: update-registry-version
|
||||
update-registry-version:
|
||||
go run hack/update/registry_version/update_registry_version.go
|
||||
cd hack && go run update/registry_version/update_registry_version.go
|
||||
|
||||
.PHONY: update-volcano-version
|
||||
update-volcano-version:
|
||||
go run hack/update/volcano_version/update_volcano_version.go
|
||||
cd hack && go run update/volcano_version/update_volcano_version.go
|
||||
|
||||
.PHONY: update-kong-version
|
||||
update-kong-version:
|
||||
go run hack/update/kong_version/update_kong_version.go
|
||||
cd hack && go run update/kong_version/update_kong_version.go
|
||||
|
||||
.PHONY: update-kong-ingress-controller-version
|
||||
update-kong-ingress-controller-version:
|
||||
go run hack/update/kong_ingress_controller_version/update_kong_ingress_controller_version.go
|
||||
cd hack && go run update/kong_ingress_controller_version/update_kong_ingress_controller_version.go
|
||||
|
||||
.PHONY: update-nvidia-device-plugin-version
|
||||
update-nvidia-device-plugin-version:
|
||||
go run hack/update/nvidia_device_plugin_version/update_nvidia_device_plugin_version.go
|
||||
cd hack && go run update/nvidia_device_plugin_version/update_nvidia_device_plugin_version.go
|
||||
|
||||
.PHONY: update-amd-gpu-device-plugin-version
|
||||
update-amd-gpu-device-plugin-version:
|
||||
go run hack/update/amd_device_plugin_version/update_amd_device_plugin_version.go
|
||||
cd hack && go run update/amd_device_plugin_version/update_amd_device_plugin_version.go
|
||||
|
||||
.PHONY: update-nerdctld-version
|
||||
update-nerdctld-version:
|
||||
go run hack/update/nerdctld_version/update_nerdctld_version.go
|
||||
cd hack && go run update/nerdctld_version/update_nerdctld_version.go
|
||||
|
||||
.PHONY: update-kubectl-version
|
||||
update-kubectl-version:
|
||||
go run hack/update/kubectl_version/update_kubectl_version.go
|
||||
cd hack && go run update/kubectl_version/update_kubectl_version.go
|
||||
|
||||
.PHONY: update-site-node-version
|
||||
update-site-node-version:
|
||||
go run hack/update/site_node_version/update_site_node_version.go
|
||||
cd hack && go run update/site_node_version/update_site_node_version.go
|
||||
|
||||
.PHONY: update-cilium-version
|
||||
update-cilium-version:
|
||||
go run hack/update/cilium_version/update_cilium_version.go
|
||||
cd hack && go run update/cilium_version/update_cilium_version.go
|
||||
|
||||
.PHONY: update-yakd-version
|
||||
update-yakd-version:
|
||||
go run hack/update/yakd_version/update_yakd_version.go
|
||||
cd hack && go run update/yakd_version/update_yakd_version.go
|
||||
|
||||
.PHONY: update-kube-registry-proxy-version
|
||||
update-kube-registry-proxy-version:
|
||||
go run hack/update/kube_registry_proxy_version/update_kube_registry_proxy_version.go
|
||||
cd hack && go run update/kube_registry_proxy_version/update_kube_registry_proxy_version.go
|
||||
|
||||
.PHONY: update-headlamp-version
|
||||
update-headlamp-version:
|
||||
go run hack/update/headlamp_version/update_headlamp_version.go
|
||||
cd hack && go run update/headlamp_version/update_headlamp_version.go
|
||||
|
||||
.PHONY: update-kube-vip-version
|
||||
update-kube-vip-version:
|
||||
go run hack/update/kube_vip_version/update_kube_vip_version.go
|
||||
cd hack && go run update/kube_vip_version/update_kube_vip_version.go
|
||||
|
||||
# used by update- Targets to get before/after versions of tools it updates
|
||||
.PHONY: get-dependency-verison
|
||||
get-dependency-version:
|
||||
go run hack/update/get_version/get_version.go
|
||||
cd hack && go run update/get_version/get_version.go
|
||||
|
|
|
|||
|
|
@ -236,3 +236,5 @@ require (
|
|||
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
|
||||
sigs.k8s.io/yaml v1.4.0 // indirect
|
||||
)
|
||||
|
||||
replace k8s.io/minikube => ../
|
||||
|
|
|
|||
|
|
@ -25,17 +25,17 @@ import (
|
|||
)
|
||||
|
||||
func main() {
|
||||
if err := os.MkdirAll("./out/docs", os.FileMode(0755)); err != nil {
|
||||
if err := os.MkdirAll("../out/docs", os.FileMode(0755)); err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
cmd.RootCmd.DisableAutoGenTag = true
|
||||
if err := doc.GenMarkdownTree(cmd.RootCmd, "./out/docs"); err != nil {
|
||||
if err := doc.GenMarkdownTree(cmd.RootCmd, "../out/docs"); err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
f, err := os.Create("./out/docs/bash-completion")
|
||||
f, err := os.Create("../out/docs/bash-completion")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ func main() {
|
|||
}
|
||||
|
||||
func updateHashFile(version, arch, filePath string) error {
|
||||
filePath = "../../../deploy/iso/minikube-iso/arch/" + filePath
|
||||
filePath = "../deploy/iso/minikube-iso/arch/" + filePath
|
||||
b, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ func updateYAML(version string) {
|
|||
for re, repl := range replacements {
|
||||
yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl))
|
||||
}
|
||||
if err := os.WriteFile("../../../pkg/minikube/cni/calico.yaml", yaml, 0644); err != nil {
|
||||
if err := os.WriteFile("../pkg/minikube/cni/calico.yaml", yaml, 0644); err != nil {
|
||||
klog.Fatalf("failed to write to YAML file: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ func updateHashFile(version, arch, packagePath string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePath := fmt.Sprintf("../../../deploy/iso/minikube-iso/arch/%s/cni-plugins-latest.hash", packagePath)
|
||||
filePath := fmt.Sprintf("../deploy/iso/minikube-iso/arch/%s/cni-plugins-latest.hash", packagePath)
|
||||
b, err = os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ func updateHashFiles(version string) error {
|
|||
}
|
||||
|
||||
func updateHashFile(version, arch, folderSuffix string, shaSum [sha256.Size]byte) error {
|
||||
filePath := fmt.Sprintf("../../../deploy/iso/minikube-iso/arch/%s/package/containerd-bin%s/containerd-bin.hash", arch, folderSuffix)
|
||||
filePath := fmt.Sprintf("../deploy/iso/minikube-iso/arch/%s/package/containerd-bin%s/containerd-bin.hash", arch, folderSuffix)
|
||||
b, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ func main() {
|
|||
}
|
||||
|
||||
func updateHashFile(version string) error {
|
||||
filePath := "../../../deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash"
|
||||
filePath := "../deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash"
|
||||
b, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ func updateHashFiles(commit string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePathBase := "../../../deploy/iso/minikube-iso/arch/"
|
||||
filePathBase := "../deploy/iso/minikube-iso/arch/"
|
||||
if err := updateHashFile(filePathBase+"aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash", commit, sum); err != nil {
|
||||
return fmt.Errorf("aarch64: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ func updateHashFile(version, arch, packagePath string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePath := fmt.Sprintf("../../../deploy/iso/minikube-iso/arch/%s/crictl-bin.hash", packagePath)
|
||||
filePath := fmt.Sprintf("../deploy/iso/minikube-iso/arch/%s/crictl-bin.hash", packagePath)
|
||||
b, err = os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func updateHashFiles(version string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePath := "../../../deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash"
|
||||
filePath := "../deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash"
|
||||
b, err = os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ func updateHashFiles(version string) error {
|
|||
}
|
||||
|
||||
func updateHashFile(version, arch, folderSuffix string, shaSum [sha256.Size]byte) error {
|
||||
filePath := fmt.Sprintf("../../../deploy/iso/minikube-iso/arch/%s/package/docker-buildx%s/docker-buildx.hash", arch, folderSuffix)
|
||||
filePath := fmt.Sprintf("../deploy/iso/minikube-iso/arch/%s/package/docker-buildx%s/docker-buildx.hash", arch, folderSuffix)
|
||||
b, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ func updateHashFile(version, arch, folderSuffix string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePath := fmt.Sprintf("../../../deploy/iso/minikube-iso/arch/%s/package/docker-bin%s/docker-bin.hash", arch, folderSuffix)
|
||||
filePath := fmt.Sprintf("../deploy/iso/minikube-iso/arch/%s/package/docker-bin%s/docker-bin.hash", arch, folderSuffix)
|
||||
b, err = os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func main() {
|
|||
klog.Fatalf("Unable to get Docsy stable version: %v", err)
|
||||
}
|
||||
|
||||
if err := exec.CommandContext(ctx, "./update_docsy_version.sh", stable).Run(); err != nil {
|
||||
if err := exec.CommandContext(ctx, "update/docsy_version/update_docsy_version.sh", stable).Run(); err != nil {
|
||||
klog.Fatalf("failed to update docsy commit: %v", err)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ fi
|
|||
readonly version=$1
|
||||
|
||||
git submodule update --init
|
||||
pushd ../../../site/themes/docsy/
|
||||
pushd ../site/themes/docsy/
|
||||
git checkout "$1"
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ func updateYAML(version string) {
|
|||
klog.Fatalf("failed to read body: %v", err)
|
||||
}
|
||||
yaml := regexp.MustCompile(`10\.244\.0\.0\/16`).ReplaceAll(body, []byte("{{ .PodCIDR }}"))
|
||||
if err := os.WriteFile("../../../pkg/minikube/cni/flannel.yaml", yaml, 0644); err != nil {
|
||||
if err := os.WriteFile("../pkg/minikube/cni/flannel.yaml", yaml, 0644); err != nil {
|
||||
klog.Fatalf("failed to write to YAML file: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ func goVersions() (stable, k8sVersion string, err error) {
|
|||
}
|
||||
|
||||
func updateGoHashFile(version string) error {
|
||||
hashFilePath := "../../../deploy/iso/minikube-iso/go.hash"
|
||||
hashFilePath := "../deploy/iso/minikube-iso/go.hash"
|
||||
b, err := os.ReadFile(hashFilePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
@ -161,7 +161,7 @@ func updateGoHashFile(version string) error {
|
|||
}
|
||||
|
||||
func addGitHubWorkflowFiles() {
|
||||
files, err := os.ReadDir("../../../.github/workflows")
|
||||
files, err := os.ReadDir("../.github/workflows")
|
||||
if err != nil {
|
||||
klog.Fatalf("failed to read workflows dir: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ func updateDeploymentYAML(version string) {
|
|||
for re, repl := range replacements {
|
||||
yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl))
|
||||
}
|
||||
if err := os.WriteFile("../../../deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl", yaml, 0644); err != nil {
|
||||
if err := os.WriteFile("../deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl", yaml, 0644); err != nil {
|
||||
klog.Fatalf("failed to write to YAML file: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
@ -97,7 +97,7 @@ func updateCRDYAML(version string) {
|
|||
if err != nil {
|
||||
klog.Fatalf("failed to read body: %v", err)
|
||||
}
|
||||
if err := os.WriteFile("../../../deploy/addons/inspektor-gadget/ig-crd.yaml", yaml, 0644); err != nil {
|
||||
if err := os.WriteFile("../deploy/addons/inspektor-gadget/ig-crd.yaml", yaml, 0644); err != nil {
|
||||
klog.Fatalf("failed to write to YAML file: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,55 +49,55 @@ var (
|
|||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd-api-port.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/containerd-api-port.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd-pod-network-cidr.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/containerd-pod-network-cidr.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/containerd.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/containerd.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/crio-options-gates.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/crio-options-gates.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/crio.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/crio.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/crio.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/default.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/default.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/default.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/dns.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/dns.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/dns.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/image-repository.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/image-repository.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/image-repository.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/options.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/options.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/options.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
|
||||
},
|
||||
|
|
@ -170,55 +170,55 @@ func updateCurrentTestDataFiles(latestMM string, data *Data) {
|
|||
|
||||
currentSchema := map[string]update.Item{
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/containerd-api-port.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/containerd-api-port.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/containerd-pod-network-cidr.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/containerd-pod-network-cidr.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/containerd.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/containerd.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/containerd.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/crio-options-gates.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/crio-options-gates.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/crio.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/crio.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/crio.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/default.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/default.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/default.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/dns.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/dns.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/dns.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/image-repository.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/image-repository.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/image-repository.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
},
|
||||
"pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/options.yaml": {
|
||||
Content: update.Loadf("templates/v1beta4/options.yaml"),
|
||||
Content: update.Loadf("update/kubernetes_version/templates/v1beta4/options.yaml"),
|
||||
Replace: map[string]string{
|
||||
`kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ func updateHashFile(version, arch, packagePath string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePath := fmt.Sprintf("../../../deploy/iso/minikube-iso/arch/%s/nerdctl-bin.hash", packagePath)
|
||||
filePath := fmt.Sprintf("../deploy/iso/minikube-iso/arch/%s/nerdctl-bin.hash", packagePath)
|
||||
b, err = os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func updateHashFiles(version string) error {
|
|||
return fmt.Errorf("failed to read response body: %v", err)
|
||||
}
|
||||
sum := sha256.Sum256(b)
|
||||
filePath := "../../../deploy/iso/minikube-iso/package/runc-master/runc-master.hash"
|
||||
filePath := "../deploy/iso/minikube-iso/package/runc-master/runc-master.hash"
|
||||
b, err = os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read hash file: %v", err)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import (
|
|||
|
||||
const (
|
||||
// FSRoot is a relative (to scripts in subfolders) root folder of local filesystem repo to update
|
||||
FSRoot = "../../../"
|
||||
FSRoot = "../"
|
||||
)
|
||||
|
||||
// init klog and check general requirements
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ func updateYAML(version string) {
|
|||
for re, repl := range replacements {
|
||||
yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl))
|
||||
}
|
||||
if err := os.WriteFile("../../../deploy/addons/volcano/volcano-development.yaml.tmpl", yaml, 0644); err != nil {
|
||||
if err := os.WriteFile("../deploy/addons/volcano/volcano-development.yaml.tmpl", yaml, 0644); err != nil {
|
||||
klog.Fatalf("failed to write to YAML file: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue