Merge pull request #4027 from monopole/deleteWindowsBuild

Temporarily remove windows build.
2026-06-17 11:58:18 +00:00 · 2021-06-30 15:37:56 -07:00 · 2021-06-30 15:36:57 -07:00 · 2021-06-30 14:04:18 -07:00 · 2021-06-30 14:02:55 -07:00 · 2021-06-30 12:53:03 -07:00
8 changed files with 21 additions and 16 deletions
--- a/cmd/pluginator/go.mod
+++ b/cmd/pluginator/go.mod
@@ -6,8 +6,6 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.5.1
-	sigs.k8s.io/kustomize/api v0.8.10
+	sigs.k8s.io/kustomize/api v0.8.11
 	sigs.k8s.io/kustomize/kyaml v0.11.0
 )
-
-replace sigs.k8s.io/kustomize/api => ../../api
--- a/cmd/pluginator/go.sum
+++ b/cmd/pluginator/go.sum
@@ -228,6 +228,8 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
+sigs.k8s.io/kustomize/api v0.8.11 h1:LzQzlq6Z023b+mBtc6v72N2mSHYmN8x7ssgbf/hv0H8=
+sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g=
 sigs.k8s.io/kustomize/kyaml v0.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA=
 sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	sigs.k8s.io/kustomize/api v0.8.10
+	sigs.k8s.io/kustomize/api v0.8.11
 	sigs.k8s.io/kustomize/cmd/config v0.9.13
 	sigs.k8s.io/kustomize/kyaml v0.11.0
 	sigs.k8s.io/yaml v1.2.0
@@ -18,5 +18,3 @@ exclude (
 	sigs.k8s.io/kustomize/api v0.2.0
 	sigs.k8s.io/kustomize/cmd/config v0.2.0
 )
-
-replace sigs.k8s.io/kustomize/api => ../api
--- a/kustomize/go.sum
+++ b/kustomize/go.sum
@@ -253,6 +253,8 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
+sigs.k8s.io/kustomize/api v0.8.11 h1:LzQzlq6Z023b+mBtc6v72N2mSHYmN8x7ssgbf/hv0H8=
+sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g=
 sigs.k8s.io/kustomize/cmd/config v0.9.13 h1:lqOf0QcFhNvgZkgrPINNRs7TxEO7IGVtLMyUJId3oRE=
 sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs=
 sigs.k8s.io/kustomize/kyaml v0.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA=
--- a/kyaml/yaml/types.go
+++ b/kyaml/yaml/types.go
@@ -139,16 +139,16 @@ type NameMeta struct {
 type ResourceMeta struct {
 	TypeMeta `json:",inline" yaml:",inline"`
 	// ObjectMeta is the metadata field of a Resource
-	ObjectMeta `yaml:"metadata,omitempty"`
+	ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
 }

 // ObjectMeta contains metadata about a Resource
 type ObjectMeta struct {
 	NameMeta `json:",inline" yaml:",inline"`
 	// Labels is the metadata.labels field of a Resource
-	Labels map[string]string `yaml:"labels,omitempty"`
+	Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
 	// Annotations is the metadata.annotations field of a Resource.
-	Annotations map[string]string `yaml:"annotations,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
 }

 // GetIdentifier returns a ResourceIdentifier that includes
--- a/releasing/cloudbuild.sh
+++ b/releasing/cloudbuild.sh
@@ -72,8 +72,9 @@ if [[ "$module" == "kustomize" || "$module" == "pluginator" ]]; then
  skipBuild=false
 fi

-configFile=$(mktemp)
-cat <<EOF >$configFile
+goReleaserConfigFile=$(mktemp)
+
+cat <<EOF >$goReleaserConfigFile
 project_name: $module

 archives:
@@ -91,7 +92,6 @@ builds:
  goos:
  - linux
  - darwin
-  - windows

  goarch:
  - amd64
@@ -112,14 +112,14 @@ release:

 EOF

-cat $configFile
+cat $goReleaserConfigFile

 date

 time /usr/local/bin/goreleaser release \
  --timeout 10m \
  --parallelism 4 \
-  --config=$configFile \
+  --config=$goReleaserConfigFile \
  --release-notes=$changeLogFile \
  --rm-dist \
  --skip-validate $remainingArgs
--- a/releasing/cloudbuild.yaml
+++ b/releasing/cloudbuild.yaml
@@ -36,7 +36,7 @@ steps:

 # Run goreleaser indirectly via a shell script
 # to configure it properly.
- name: goreleaser/goreleaser:v0.155.0
+- name: goreleaser/goreleaser:v0.172.1
  timeout: 12m
  entrypoint: /bin/sh
  dir: myClone
--- a/releasing/localbuild.sh
+++ b/releasing/localbuild.sh
@@ -29,14 +29,17 @@ cp releasing/cloudbuild.yaml $config
 # in the kustomize/dist directory.
 sed -i "s|# - '--snapshot|- '--snapshot|" $config

-echo "Executing cloud-build-local with:"
+echo "Executing cloud-build-local with config file $config :"
 echo "========================="
 cat $config
 echo "========================="

+workspace=~/cloud-build-local-workspace
+
 cloud-build-local \
    --config=$config \
    --substitutions=TAG_NAME=$1 \
+    --write-workspace=$workspace \
    --dryrun=false \
    .

@@ -47,3 +50,5 @@ echo "Result of local build:"
 echo "##########################################"
 tree ./$module/dist
 echo "##########################################"
+tree ./$workspace
+echo "##########################################"
Author	SHA1	Message	Date
Jeff Regan	d53a2ad45d	Merge pull request #4027 from monopole/deleteWindowsBuild Temporarily remove windows build.	2021-06-30 15:37:56 -07:00
monopole	bb02a7645b	Temporarily remove windows build.	2021-06-30 15:36:57 -07:00
Jeff Regan	5a9d90c872	Merge pull request #4026 from monopole/upgradeGoReleaser release process: upgrade to goreleaser v0.172.1 calling go1.16.5	2021-06-30 14:04:18 -07:00
monopole	4fd7269643	release process: upgrade to goreleaser v0.172.1 calling go go1.16.5	2021-06-30 14:02:55 -07:00
Kubernetes Prow Robot	1eb3c1a075	Merge pull request #4025 from KnVerey/pinToApi Pin to api v0.8.11	2021-06-30 12:53:03 -07:00
Katrina Verey	a1746f2f8c	Pin to api v0.8.11	2021-06-30 12:42:04 -07:00
Kubernetes Prow Robot	b727febd08	Merge pull request #4023 from mengqiy/jsontag add missing json tags	2021-06-30 12:37:03 -07:00
Mengqi Yu	02d14d724a	add missing json tags	2021-06-30 12:15:50 -07:00