From e0c5acf2f331047eb000ca91a5d101fe8e8659d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <66256922+daniel-weisse@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:04:07 +0200 Subject: [PATCH] deps: update k8s replace directive (#3193) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- go.mod | 51 ++++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 07887fa5a7..480039016d 100644 --- a/go.mod +++ b/go.mod @@ -2,40 +2,29 @@ module github.com/edgelesssys/constellation/v2 go 1.22.3 -replace ( - k8s.io/api v0.0.0 => k8s.io/api v0.29.0 - k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.29.0 - k8s.io/apimachinery v0.0.0 => k8s.io/apimachinery v0.29.0 - k8s.io/apiserver v0.0.0 => k8s.io/apiserver v0.29.0 - k8s.io/cli-runtime v0.0.0 => k8s.io/cli-runtime v0.29.0 - k8s.io/client-go v0.0.0 => k8s.io/client-go v0.29.0 - k8s.io/cloud-provider v0.0.0 => k8s.io/cloud-provider v0.29.0 - k8s.io/cluster-bootstrap v0.0.0 => k8s.io/cluster-bootstrap v0.29.0 - k8s.io/code-generator v0.0.0 => k8s.io/code-generator v0.29.0 - k8s.io/component-base v0.0.0 => k8s.io/component-base v0.29.0 - k8s.io/component-helpers v0.0.0 => k8s.io/component-helpers v0.29.0 - k8s.io/controller-manager v0.0.0 => k8s.io/controller-manager v0.29.0 - k8s.io/cri-api v0.0.0 => k8s.io/cri-api v0.29.0 - k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.29.0 - k8s.io/dynamic-resource-allocation v0.0.0 => k8s.io/dynamic-resource-allocation v0.29.0 - k8s.io/endpointslice v0.0.0 => k8s.io/endpointslice v0.29.0 - k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.29.0 - k8s.io/kube-controller-manager v0.0.0 => k8s.io/kube-controller-manager v0.29.0 - k8s.io/kube-proxy v0.0.0 => k8s.io/kube-proxy v0.29.0 - k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.29.0 - k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.29.0 - k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.29.0 - k8s.io/kubernetes v0.0.0 => k8s.io/kubernetes v1.29.0 - k8s.io/legacy-cloud-providers v0.0.0 => k8s.io/legacy-cloud-providers v0.29.0 - k8s.io/metrics v0.0.0 => k8s.io/metrics v0.29.0 - k8s.io/mount-utils v0.0.0 => k8s.io/mount-utils v0.29.0 - k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.29.0 - k8s.io/sample-apiserver v0.0.0 => k8s.io/sample-apiserver v0.29.0 -) - // TODO(daniel-weisse): revert after merging https://github.com/martinjungblut/go-cryptsetup/pull/16. replace github.com/martinjungblut/go-cryptsetup => github.com/daniel-weisse/go-cryptsetup v0.0.0-20230705150314-d8c07bd1723c +// Kubernetes replace directives are required because we depend on k8s.io/kubernetes/cmd/kubeadm +// k8s discourages usage of k8s.io/kubernetes as a dependency, but no external staging repositories for kubeadm exist. +// Our code does not actually depend on these packages, but `go mod download` breaks without this replace directive. +// See this issue: https://github.com/kubernetes/kubernetes/issues/79384 +// And this README: https://github.com/kubernetes/kubernetes/blob/master/staging/README.md +replace ( + k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.30.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.2 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.2 + k8s.io/endpointslice => k8s.io/endpointslice v0.30.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.2 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.2 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.2 +) + require ( cloud.google.com/go/compute v1.27.0 cloud.google.com/go/compute/metadata v0.3.0