Merge pull request #2066 from pwittrock/master

Use latest kstatus when releasing cmd/resources

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

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
 )

releasing/VERSIONS

@@ -6,7 +6,12 @@
 # kyaml version
 export kyaml_major=0
 export kyaml_minor=0
-export kyaml_patch=5
+export kyaml_patch=6
+
+# kstatus version
+export kstatus_major=0
+export kstatus_minor=0
+export kstatus_patch=1
 
 # kustomize api version
 export api_major=0
@@ -16,12 +21,17 @@ export api_patch=1
 # cmd/config version
 export cmd_config_major=0
 export cmd_config_minor=0
-export cmd_config_patch=5
+export cmd_config_patch=6
 
 # cmd/kubectl version
 export cmd_kubectl_major=0
 export cmd_kubectl_minor=0
-export cmd_kubectl_patch=2
+export cmd_kubectl_patch=3
+
+# cmd/resource version
+export cmd_resource_major=0
+export cmd_resource_minor=0
+export cmd_resource_patch=1
 
 # kustomize version
 export kustomize_major=3

releasing/releasemodule.sh

@@ -67,7 +67,7 @@ function releaseModule {
   echo "$module complete"
 }
 
-modules="kyaml api cmd/config cmd/kubectl pluginator kustomize"
+modules="kyaml api kstatus cmd/config cmd/resource cmd/kubectl pluginator kustomize"
 
 # configure the branch and tag names
 module="${1?must provide the module to release as an argument: supported modules [$modules]}"