From 27862874440adf3a000a23cc69953dcdcddff634 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 9 Jan 2020 20:33:38 -0800 Subject: [PATCH] Use latest kstatus when releasing cmd/resources --- cmd/resource/fixgomod.sh | 20 ++++++++++++++++++++ cmd/resource/go.mod | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100755 cmd/resource/fixgomod.sh diff --git a/cmd/resource/fixgomod.sh b/cmd/resource/fixgomod.sh new file mode 100755 index 000000000..fdf07ff61 --- /dev/null +++ b/cmd/resource/fixgomod.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# Copyright 2019 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +set -e + +: "${kyaml_major?Need to source VERSIONS}" +: "${kyaml_minor?Need to source VERSIONS}" +: "${kyaml_patch?Need to source VERSIONS}" + +: "${kstatus_major?Need to source VERSIONS}" +: "${kstatus_minor?Need to source VERSIONS}" +: "${kstatus_patch?Need to source VERSIONS}" + + +go mod edit -dropreplace=sigs.k8s.io/kustomize/kyaml@v0.0.0 +go mod edit -require=sigs.k8s.io/kustomize/kyaml@v$kyaml_major.$kyaml_minor.$kyaml_patch + +go mod edit -dropreplace=sigs.k8s.io/kustomize/kstatus@v0.0.0 +go mod edit -require=sigs.k8s.io/kustomize/kstatus@v$kstatus_major.$kstatus_minor.$kstatus_patch diff --git a/cmd/resource/go.mod b/cmd/resource/go.mod index 9a31f15de..38ca742aa 100644 --- a/cmd/resource/go.mod +++ b/cmd/resource/go.mod @@ -12,11 +12,11 @@ require ( k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90 sigs.k8s.io/controller-runtime v0.4.0 - sigs.k8s.io/kustomize/kstatus v0.0.0-20191204200457-7c1b477ff62d - sigs.k8s.io/kustomize/kyaml v0.0.0-20191202204815-0a19a5dbd9b8 + sigs.k8s.io/kustomize/kstatus v0.0.0 + sigs.k8s.io/kustomize/kyaml v0.0.0 ) replace ( - sigs.k8s.io/kustomize/kstatus v0.0.0-20191204200457-7c1b477ff62d => ../../kstatus - sigs.k8s.io/kustomize/kyaml v0.0.0-20191202204815-0a19a5dbd9b8 => ../../kyaml + sigs.k8s.io/kustomize/kstatus v0.0.0 => ../../kstatus + sigs.k8s.io/kustomize/kyaml v0.0.0 => ../../kyaml )