From 78d14d0d75e7df275bebe418c9e9d4e6664b0f6a Mon Sep 17 00:00:00 2001 From: jregan Date: Mon, 7 Oct 2019 21:21:12 -0700 Subject: [PATCH] Introduce dummy program to help with API releases. --- go.mod | 6 +- go.sum | 18 +++--- internal/{tools => crawl}/README.md | 0 internal/{tools => crawl}/ROADMAP.md | 0 .../backend/search_backend.go | 0 .../{tools => crawl}/cmd/backend/Dockerfile | 0 internal/{tools => crawl}/cmd/backend/main.go | 0 .../config/base/kustomization.yaml | 0 .../config/crawler/base/kustomization.yaml | 0 .../config/crawler/cronjob/cronjob.yaml | 0 .../config/crawler/cronjob/kustomization.yaml | 0 .../config/crawler/job/job.yaml | 0 .../config/crawler/job/kustomization.yaml | 0 .../document_keystore/kustomization.yaml | 0 .../config/redis/document_keystore/redis.yaml | 0 .../redis/document_keystore/service.yaml | 0 .../redis/http_cache/kustomization.yaml | 0 .../config/redis/http_cache/redis.yaml | 0 .../config/redis/http_cache/service.yaml | 0 .../config/webapp/backend/deployment.yaml | 0 .../config/webapp/backend/kustomization.yaml | 0 .../config/webapp/backend/service.yaml | 0 .../config/webapp/frontend/deployment.yaml | 0 .../config/webapp/frontend/kustomization.yaml | 0 .../config/webapp/frontend/service.yaml | 0 internal/{tools => crawl}/crawler/crawler.go | 0 .../{tools => crawl}/crawler/crawler_test.go | 0 .../crawler/github/crawler.go | 0 .../crawler/github/queries.go | 0 .../crawler/github/queries_test.go | 0 .../crawler/github/split_search_ranges.go | 0 .../github/split_search_ranges_test.go | 0 internal/{tools => crawl}/doc/doc.go | 0 internal/{tools => crawl}/doc/doc_test.go | 0 internal/{tools => crawl}/doc/docname.go | 0 internal/{tools => crawl}/doc/docname_test.go | 0 .../{tools => crawl}/doc/kustomize_util.go | 0 internal/{tools => crawl}/go.mod | 0 internal/{tools => crawl}/go.sum | 0 .../{tools => crawl}/httpclient/httpclient.go | 0 .../{tools => crawl}/index/elasticsearch.go | 0 internal/{tools => crawl}/index/kustomize.go | 0 .../{tools => crawl}/index/kustomize_test.go | 0 .../pictures/github_token.png | Bin .../{tools => crawl}/pictures/sys_arch.png | Bin .../pictures/token_config.png | Bin internal/{tools => crawl}/ui/.dockerignore | 0 internal/{tools => crawl}/ui/.gcloudignore | 0 internal/{tools => crawl}/ui/.gitignore | 0 internal/{tools => crawl}/ui/Dockerfile | 0 internal/{tools => crawl}/ui/README.md | 0 internal/{tools => crawl}/ui/angular.json | 0 internal/{tools => crawl}/ui/browserslist | 0 internal/{tools => crawl}/ui/cloudbuild.yaml | 0 .../ui/e2e/protractor.conf.js | 0 .../ui/e2e/src/app.e2e-spec.ts | 0 .../{tools => crawl}/ui/e2e/src/app.po.ts | 0 .../{tools => crawl}/ui/e2e/tsconfig.json | 0 internal/{tools => crawl}/ui/karma.conf.js | 0 internal/{tools => crawl}/ui/nginx.conf | 0 .../{tools => crawl}/ui/package-lock.json | 0 internal/{tools => crawl}/ui/package.json | 0 .../ui/src/app/app.component.css | 0 .../ui/src/app/app.component.html | 0 .../ui/src/app/app.component.spec.ts | 0 .../ui/src/app/app.component.ts | 0 .../{tools => crawl}/ui/src/app/app.module.ts | 0 .../{tools => crawl}/ui/src/app/documents.ts | 0 .../src/app/histogram/histogram.component.css | 0 .../app/histogram/histogram.component.html | 0 .../app/histogram/histogram.component.spec.ts | 0 .../src/app/histogram/histogram.component.ts | 0 .../ui/src/app/search/search.component.css | 0 .../ui/src/app/search/search.component.html | 0 .../src/app/search/search.component.spec.ts | 0 .../ui/src/app/search/search.component.ts | 0 .../ui/src/app/search/search.service.ts | 0 .../app/timeseries/timeseries.component.css | 0 .../app/timeseries/timeseries.component.html | 0 .../timeseries/timeseries.component.spec.ts | 0 .../app/timeseries/timeseries.component.ts | 0 .../{tools => crawl}/ui/src/assets/.gitkeep | 0 .../ui/src/environments/environment.prod.ts | 0 .../ui/src/environments/environment.ts | 0 internal/{tools => crawl}/ui/src/favicon.ico | Bin internal/{tools => crawl}/ui/src/index.html | 0 internal/{tools => crawl}/ui/src/main.ts | 0 internal/{tools => crawl}/ui/src/polyfills.ts | 0 internal/{tools => crawl}/ui/src/styles.css | 0 internal/{tools => crawl}/ui/src/test.ts | 0 .../{tools => crawl}/ui/tsconfig.app.json | 0 internal/{tools => crawl}/ui/tsconfig.json | 0 .../{tools => crawl}/ui/tsconfig.spec.json | 0 internal/{tools => crawl}/ui/tslint.json | 0 {tools => internal/tools}/tools.go | 0 kustapiversion/main.go | 21 ++++++ kustomize/go.mod | 8 +-- kustomize/go.sum | 31 +++++++-- .../internal/commands/version/version.go | 2 +- kustomize/main.go | 1 + pkg/target/chartinflatorplugin_test.go | 6 +- .../v1/chartinflator/ChartInflator_test.go | 6 +- pluginator/go.mod | 2 + pluginator/go.sum | 19 +++--- pluginator/main.go | 8 ++- .../provenance => provenance}/provenance.go | 0 releasing/README.md | 20 +++--- releasing/cloudbuild.sh | 61 ++++++------------ releasing/cloudbuild_api.yaml | 11 ++++ releasing/localbuild.sh | 16 +++-- 110 files changed, 135 insertions(+), 101 deletions(-) rename internal/{tools => crawl}/README.md (100%) rename internal/{tools => crawl}/ROADMAP.md (100%) rename internal/{tools => crawl}/backend/search_backend.go (100%) rename internal/{tools => crawl}/cmd/backend/Dockerfile (100%) rename internal/{tools => crawl}/cmd/backend/main.go (100%) rename internal/{tools => crawl}/config/base/kustomization.yaml (100%) rename internal/{tools => crawl}/config/crawler/base/kustomization.yaml (100%) rename internal/{tools => crawl}/config/crawler/cronjob/cronjob.yaml (100%) rename internal/{tools => crawl}/config/crawler/cronjob/kustomization.yaml (100%) rename internal/{tools => crawl}/config/crawler/job/job.yaml (100%) rename internal/{tools => crawl}/config/crawler/job/kustomization.yaml (100%) rename internal/{tools => crawl}/config/redis/document_keystore/kustomization.yaml (100%) rename internal/{tools => crawl}/config/redis/document_keystore/redis.yaml (100%) rename internal/{tools => crawl}/config/redis/document_keystore/service.yaml (100%) rename internal/{tools => crawl}/config/redis/http_cache/kustomization.yaml (100%) rename internal/{tools => crawl}/config/redis/http_cache/redis.yaml (100%) rename internal/{tools => crawl}/config/redis/http_cache/service.yaml (100%) rename internal/{tools => crawl}/config/webapp/backend/deployment.yaml (100%) rename internal/{tools => crawl}/config/webapp/backend/kustomization.yaml (100%) rename internal/{tools => crawl}/config/webapp/backend/service.yaml (100%) rename internal/{tools => crawl}/config/webapp/frontend/deployment.yaml (100%) rename internal/{tools => crawl}/config/webapp/frontend/kustomization.yaml (100%) rename internal/{tools => crawl}/config/webapp/frontend/service.yaml (100%) rename internal/{tools => crawl}/crawler/crawler.go (100%) rename internal/{tools => crawl}/crawler/crawler_test.go (100%) rename internal/{tools => crawl}/crawler/github/crawler.go (100%) rename internal/{tools => crawl}/crawler/github/queries.go (100%) rename internal/{tools => crawl}/crawler/github/queries_test.go (100%) rename internal/{tools => crawl}/crawler/github/split_search_ranges.go (100%) rename internal/{tools => crawl}/crawler/github/split_search_ranges_test.go (100%) rename internal/{tools => crawl}/doc/doc.go (100%) rename internal/{tools => crawl}/doc/doc_test.go (100%) rename internal/{tools => crawl}/doc/docname.go (100%) rename internal/{tools => crawl}/doc/docname_test.go (100%) rename internal/{tools => crawl}/doc/kustomize_util.go (100%) rename internal/{tools => crawl}/go.mod (100%) rename internal/{tools => crawl}/go.sum (100%) rename internal/{tools => crawl}/httpclient/httpclient.go (100%) rename internal/{tools => crawl}/index/elasticsearch.go (100%) rename internal/{tools => crawl}/index/kustomize.go (100%) rename internal/{tools => crawl}/index/kustomize_test.go (100%) rename internal/{tools => crawl}/pictures/github_token.png (100%) rename internal/{tools => crawl}/pictures/sys_arch.png (100%) rename internal/{tools => crawl}/pictures/token_config.png (100%) rename internal/{tools => crawl}/ui/.dockerignore (100%) rename internal/{tools => crawl}/ui/.gcloudignore (100%) rename internal/{tools => crawl}/ui/.gitignore (100%) rename internal/{tools => crawl}/ui/Dockerfile (100%) rename internal/{tools => crawl}/ui/README.md (100%) rename internal/{tools => crawl}/ui/angular.json (100%) rename internal/{tools => crawl}/ui/browserslist (100%) rename internal/{tools => crawl}/ui/cloudbuild.yaml (100%) rename internal/{tools => crawl}/ui/e2e/protractor.conf.js (100%) rename internal/{tools => crawl}/ui/e2e/src/app.e2e-spec.ts (100%) rename internal/{tools => crawl}/ui/e2e/src/app.po.ts (100%) rename internal/{tools => crawl}/ui/e2e/tsconfig.json (100%) rename internal/{tools => crawl}/ui/karma.conf.js (100%) rename internal/{tools => crawl}/ui/nginx.conf (100%) rename internal/{tools => crawl}/ui/package-lock.json (100%) rename internal/{tools => crawl}/ui/package.json (100%) rename internal/{tools => crawl}/ui/src/app/app.component.css (100%) rename internal/{tools => crawl}/ui/src/app/app.component.html (100%) rename internal/{tools => crawl}/ui/src/app/app.component.spec.ts (100%) rename internal/{tools => crawl}/ui/src/app/app.component.ts (100%) rename internal/{tools => crawl}/ui/src/app/app.module.ts (100%) rename internal/{tools => crawl}/ui/src/app/documents.ts (100%) rename internal/{tools => crawl}/ui/src/app/histogram/histogram.component.css (100%) rename internal/{tools => crawl}/ui/src/app/histogram/histogram.component.html (100%) rename internal/{tools => crawl}/ui/src/app/histogram/histogram.component.spec.ts (100%) rename internal/{tools => crawl}/ui/src/app/histogram/histogram.component.ts (100%) rename internal/{tools => crawl}/ui/src/app/search/search.component.css (100%) rename internal/{tools => crawl}/ui/src/app/search/search.component.html (100%) rename internal/{tools => crawl}/ui/src/app/search/search.component.spec.ts (100%) rename internal/{tools => crawl}/ui/src/app/search/search.component.ts (100%) rename internal/{tools => crawl}/ui/src/app/search/search.service.ts (100%) rename internal/{tools => crawl}/ui/src/app/timeseries/timeseries.component.css (100%) rename internal/{tools => crawl}/ui/src/app/timeseries/timeseries.component.html (100%) rename internal/{tools => crawl}/ui/src/app/timeseries/timeseries.component.spec.ts (100%) rename internal/{tools => crawl}/ui/src/app/timeseries/timeseries.component.ts (100%) rename internal/{tools => crawl}/ui/src/assets/.gitkeep (100%) rename internal/{tools => crawl}/ui/src/environments/environment.prod.ts (100%) rename internal/{tools => crawl}/ui/src/environments/environment.ts (100%) rename internal/{tools => crawl}/ui/src/favicon.ico (100%) rename internal/{tools => crawl}/ui/src/index.html (100%) rename internal/{tools => crawl}/ui/src/main.ts (100%) rename internal/{tools => crawl}/ui/src/polyfills.ts (100%) rename internal/{tools => crawl}/ui/src/styles.css (100%) rename internal/{tools => crawl}/ui/src/test.ts (100%) rename internal/{tools => crawl}/ui/tsconfig.app.json (100%) rename internal/{tools => crawl}/ui/tsconfig.json (100%) rename internal/{tools => crawl}/ui/tsconfig.spec.json (100%) rename internal/{tools => crawl}/ui/tslint.json (100%) rename {tools => internal/tools}/tools.go (100%) create mode 100644 kustapiversion/main.go rename {kustomize/provenance => provenance}/provenance.go (100%) create mode 100644 releasing/cloudbuild_api.yaml diff --git a/go.mod b/go.mod index cdeeb5389..5490a1f97 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,11 @@ go 1.12 require ( github.com/evanphx/json-patch v4.5.0+incompatible github.com/go-openapi/spec v0.19.2 - github.com/gogo/protobuf v1.3.0 // indirect github.com/golangci/golangci-lint v1.19.1 github.com/gorilla/mux v1.7.3 // indirect github.com/gorilla/sessions v1.2.0 // indirect - github.com/gorilla/websocket v1.4.1 // indirect - github.com/monopole/mdrip v0.2.48 + github.com/monopole/mdrip v1.0.0 github.com/pkg/errors v0.8.1 - github.com/russross/blackfriday v2.0.0+incompatible // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 gopkg.in/yaml.v2 v2.2.2 k8s.io/api v0.0.0-20190313235455-40a48860b5ab diff --git a/go.sum b/go.sum index f9de625f8..ae69e5c65 100644 --- a/go.sum +++ b/go.sum @@ -89,9 +89,8 @@ github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -142,15 +141,19 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0= github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/securecookie v0.0.0-20160422134519-667fe4e3466a/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v0.0.0-20160922145804-ca9ada445741/go.mod h1:+WVp8kdw6VhyKExm03PAMRn2ZxnPtm58pV0dBVPdhHE= github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ= github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 h1:JVnpOZS+qxli+rgVl98ILOXVNbW+kb5wcxeGx8ShUIw= github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -168,7 +171,6 @@ github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwK github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -211,8 +213,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/monopole/mdrip v0.2.48 h1:LVXlMzEyJOPouL5MYN9z61rMHwatLV1JZZSN+mmI6zI= -github.com/monopole/mdrip v0.2.48/go.mod h1:rzORfdNQ63T/tS95GOFHB+I3OrT+Bjlk8krOc/QiL/8= +github.com/monopole/mdrip v1.0.0 h1:RFDBa+tab6mW+gX4Ww2SZDc4kS6p01FwnLtgz64Il+I= +github.com/monopole/mdrip v1.0.0/go.mod h1:N1/ppRG9CaPeUKAUHZ3dUlfOT81lTpKZLkyhCvTETwM= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -250,6 +252,7 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -370,7 +373,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/tools/README.md b/internal/crawl/README.md similarity index 100% rename from internal/tools/README.md rename to internal/crawl/README.md diff --git a/internal/tools/ROADMAP.md b/internal/crawl/ROADMAP.md similarity index 100% rename from internal/tools/ROADMAP.md rename to internal/crawl/ROADMAP.md diff --git a/internal/tools/backend/search_backend.go b/internal/crawl/backend/search_backend.go similarity index 100% rename from internal/tools/backend/search_backend.go rename to internal/crawl/backend/search_backend.go diff --git a/internal/tools/cmd/backend/Dockerfile b/internal/crawl/cmd/backend/Dockerfile similarity index 100% rename from internal/tools/cmd/backend/Dockerfile rename to internal/crawl/cmd/backend/Dockerfile diff --git a/internal/tools/cmd/backend/main.go b/internal/crawl/cmd/backend/main.go similarity index 100% rename from internal/tools/cmd/backend/main.go rename to internal/crawl/cmd/backend/main.go diff --git a/internal/tools/config/base/kustomization.yaml b/internal/crawl/config/base/kustomization.yaml similarity index 100% rename from internal/tools/config/base/kustomization.yaml rename to internal/crawl/config/base/kustomization.yaml diff --git a/internal/tools/config/crawler/base/kustomization.yaml b/internal/crawl/config/crawler/base/kustomization.yaml similarity index 100% rename from internal/tools/config/crawler/base/kustomization.yaml rename to internal/crawl/config/crawler/base/kustomization.yaml diff --git a/internal/tools/config/crawler/cronjob/cronjob.yaml b/internal/crawl/config/crawler/cronjob/cronjob.yaml similarity index 100% rename from internal/tools/config/crawler/cronjob/cronjob.yaml rename to internal/crawl/config/crawler/cronjob/cronjob.yaml diff --git a/internal/tools/config/crawler/cronjob/kustomization.yaml b/internal/crawl/config/crawler/cronjob/kustomization.yaml similarity index 100% rename from internal/tools/config/crawler/cronjob/kustomization.yaml rename to internal/crawl/config/crawler/cronjob/kustomization.yaml diff --git a/internal/tools/config/crawler/job/job.yaml b/internal/crawl/config/crawler/job/job.yaml similarity index 100% rename from internal/tools/config/crawler/job/job.yaml rename to internal/crawl/config/crawler/job/job.yaml diff --git a/internal/tools/config/crawler/job/kustomization.yaml b/internal/crawl/config/crawler/job/kustomization.yaml similarity index 100% rename from internal/tools/config/crawler/job/kustomization.yaml rename to internal/crawl/config/crawler/job/kustomization.yaml diff --git a/internal/tools/config/redis/document_keystore/kustomization.yaml b/internal/crawl/config/redis/document_keystore/kustomization.yaml similarity index 100% rename from internal/tools/config/redis/document_keystore/kustomization.yaml rename to internal/crawl/config/redis/document_keystore/kustomization.yaml diff --git a/internal/tools/config/redis/document_keystore/redis.yaml b/internal/crawl/config/redis/document_keystore/redis.yaml similarity index 100% rename from internal/tools/config/redis/document_keystore/redis.yaml rename to internal/crawl/config/redis/document_keystore/redis.yaml diff --git a/internal/tools/config/redis/document_keystore/service.yaml b/internal/crawl/config/redis/document_keystore/service.yaml similarity index 100% rename from internal/tools/config/redis/document_keystore/service.yaml rename to internal/crawl/config/redis/document_keystore/service.yaml diff --git a/internal/tools/config/redis/http_cache/kustomization.yaml b/internal/crawl/config/redis/http_cache/kustomization.yaml similarity index 100% rename from internal/tools/config/redis/http_cache/kustomization.yaml rename to internal/crawl/config/redis/http_cache/kustomization.yaml diff --git a/internal/tools/config/redis/http_cache/redis.yaml b/internal/crawl/config/redis/http_cache/redis.yaml similarity index 100% rename from internal/tools/config/redis/http_cache/redis.yaml rename to internal/crawl/config/redis/http_cache/redis.yaml diff --git a/internal/tools/config/redis/http_cache/service.yaml b/internal/crawl/config/redis/http_cache/service.yaml similarity index 100% rename from internal/tools/config/redis/http_cache/service.yaml rename to internal/crawl/config/redis/http_cache/service.yaml diff --git a/internal/tools/config/webapp/backend/deployment.yaml b/internal/crawl/config/webapp/backend/deployment.yaml similarity index 100% rename from internal/tools/config/webapp/backend/deployment.yaml rename to internal/crawl/config/webapp/backend/deployment.yaml diff --git a/internal/tools/config/webapp/backend/kustomization.yaml b/internal/crawl/config/webapp/backend/kustomization.yaml similarity index 100% rename from internal/tools/config/webapp/backend/kustomization.yaml rename to internal/crawl/config/webapp/backend/kustomization.yaml diff --git a/internal/tools/config/webapp/backend/service.yaml b/internal/crawl/config/webapp/backend/service.yaml similarity index 100% rename from internal/tools/config/webapp/backend/service.yaml rename to internal/crawl/config/webapp/backend/service.yaml diff --git a/internal/tools/config/webapp/frontend/deployment.yaml b/internal/crawl/config/webapp/frontend/deployment.yaml similarity index 100% rename from internal/tools/config/webapp/frontend/deployment.yaml rename to internal/crawl/config/webapp/frontend/deployment.yaml diff --git a/internal/tools/config/webapp/frontend/kustomization.yaml b/internal/crawl/config/webapp/frontend/kustomization.yaml similarity index 100% rename from internal/tools/config/webapp/frontend/kustomization.yaml rename to internal/crawl/config/webapp/frontend/kustomization.yaml diff --git a/internal/tools/config/webapp/frontend/service.yaml b/internal/crawl/config/webapp/frontend/service.yaml similarity index 100% rename from internal/tools/config/webapp/frontend/service.yaml rename to internal/crawl/config/webapp/frontend/service.yaml diff --git a/internal/tools/crawler/crawler.go b/internal/crawl/crawler/crawler.go similarity index 100% rename from internal/tools/crawler/crawler.go rename to internal/crawl/crawler/crawler.go diff --git a/internal/tools/crawler/crawler_test.go b/internal/crawl/crawler/crawler_test.go similarity index 100% rename from internal/tools/crawler/crawler_test.go rename to internal/crawl/crawler/crawler_test.go diff --git a/internal/tools/crawler/github/crawler.go b/internal/crawl/crawler/github/crawler.go similarity index 100% rename from internal/tools/crawler/github/crawler.go rename to internal/crawl/crawler/github/crawler.go diff --git a/internal/tools/crawler/github/queries.go b/internal/crawl/crawler/github/queries.go similarity index 100% rename from internal/tools/crawler/github/queries.go rename to internal/crawl/crawler/github/queries.go diff --git a/internal/tools/crawler/github/queries_test.go b/internal/crawl/crawler/github/queries_test.go similarity index 100% rename from internal/tools/crawler/github/queries_test.go rename to internal/crawl/crawler/github/queries_test.go diff --git a/internal/tools/crawler/github/split_search_ranges.go b/internal/crawl/crawler/github/split_search_ranges.go similarity index 100% rename from internal/tools/crawler/github/split_search_ranges.go rename to internal/crawl/crawler/github/split_search_ranges.go diff --git a/internal/tools/crawler/github/split_search_ranges_test.go b/internal/crawl/crawler/github/split_search_ranges_test.go similarity index 100% rename from internal/tools/crawler/github/split_search_ranges_test.go rename to internal/crawl/crawler/github/split_search_ranges_test.go diff --git a/internal/tools/doc/doc.go b/internal/crawl/doc/doc.go similarity index 100% rename from internal/tools/doc/doc.go rename to internal/crawl/doc/doc.go diff --git a/internal/tools/doc/doc_test.go b/internal/crawl/doc/doc_test.go similarity index 100% rename from internal/tools/doc/doc_test.go rename to internal/crawl/doc/doc_test.go diff --git a/internal/tools/doc/docname.go b/internal/crawl/doc/docname.go similarity index 100% rename from internal/tools/doc/docname.go rename to internal/crawl/doc/docname.go diff --git a/internal/tools/doc/docname_test.go b/internal/crawl/doc/docname_test.go similarity index 100% rename from internal/tools/doc/docname_test.go rename to internal/crawl/doc/docname_test.go diff --git a/internal/tools/doc/kustomize_util.go b/internal/crawl/doc/kustomize_util.go similarity index 100% rename from internal/tools/doc/kustomize_util.go rename to internal/crawl/doc/kustomize_util.go diff --git a/internal/tools/go.mod b/internal/crawl/go.mod similarity index 100% rename from internal/tools/go.mod rename to internal/crawl/go.mod diff --git a/internal/tools/go.sum b/internal/crawl/go.sum similarity index 100% rename from internal/tools/go.sum rename to internal/crawl/go.sum diff --git a/internal/tools/httpclient/httpclient.go b/internal/crawl/httpclient/httpclient.go similarity index 100% rename from internal/tools/httpclient/httpclient.go rename to internal/crawl/httpclient/httpclient.go diff --git a/internal/tools/index/elasticsearch.go b/internal/crawl/index/elasticsearch.go similarity index 100% rename from internal/tools/index/elasticsearch.go rename to internal/crawl/index/elasticsearch.go diff --git a/internal/tools/index/kustomize.go b/internal/crawl/index/kustomize.go similarity index 100% rename from internal/tools/index/kustomize.go rename to internal/crawl/index/kustomize.go diff --git a/internal/tools/index/kustomize_test.go b/internal/crawl/index/kustomize_test.go similarity index 100% rename from internal/tools/index/kustomize_test.go rename to internal/crawl/index/kustomize_test.go diff --git a/internal/tools/pictures/github_token.png b/internal/crawl/pictures/github_token.png similarity index 100% rename from internal/tools/pictures/github_token.png rename to internal/crawl/pictures/github_token.png diff --git a/internal/tools/pictures/sys_arch.png b/internal/crawl/pictures/sys_arch.png similarity index 100% rename from internal/tools/pictures/sys_arch.png rename to internal/crawl/pictures/sys_arch.png diff --git a/internal/tools/pictures/token_config.png b/internal/crawl/pictures/token_config.png similarity index 100% rename from internal/tools/pictures/token_config.png rename to internal/crawl/pictures/token_config.png diff --git a/internal/tools/ui/.dockerignore b/internal/crawl/ui/.dockerignore similarity index 100% rename from internal/tools/ui/.dockerignore rename to internal/crawl/ui/.dockerignore diff --git a/internal/tools/ui/.gcloudignore b/internal/crawl/ui/.gcloudignore similarity index 100% rename from internal/tools/ui/.gcloudignore rename to internal/crawl/ui/.gcloudignore diff --git a/internal/tools/ui/.gitignore b/internal/crawl/ui/.gitignore similarity index 100% rename from internal/tools/ui/.gitignore rename to internal/crawl/ui/.gitignore diff --git a/internal/tools/ui/Dockerfile b/internal/crawl/ui/Dockerfile similarity index 100% rename from internal/tools/ui/Dockerfile rename to internal/crawl/ui/Dockerfile diff --git a/internal/tools/ui/README.md b/internal/crawl/ui/README.md similarity index 100% rename from internal/tools/ui/README.md rename to internal/crawl/ui/README.md diff --git a/internal/tools/ui/angular.json b/internal/crawl/ui/angular.json similarity index 100% rename from internal/tools/ui/angular.json rename to internal/crawl/ui/angular.json diff --git a/internal/tools/ui/browserslist b/internal/crawl/ui/browserslist similarity index 100% rename from internal/tools/ui/browserslist rename to internal/crawl/ui/browserslist diff --git a/internal/tools/ui/cloudbuild.yaml b/internal/crawl/ui/cloudbuild.yaml similarity index 100% rename from internal/tools/ui/cloudbuild.yaml rename to internal/crawl/ui/cloudbuild.yaml diff --git a/internal/tools/ui/e2e/protractor.conf.js b/internal/crawl/ui/e2e/protractor.conf.js similarity index 100% rename from internal/tools/ui/e2e/protractor.conf.js rename to internal/crawl/ui/e2e/protractor.conf.js diff --git a/internal/tools/ui/e2e/src/app.e2e-spec.ts b/internal/crawl/ui/e2e/src/app.e2e-spec.ts similarity index 100% rename from internal/tools/ui/e2e/src/app.e2e-spec.ts rename to internal/crawl/ui/e2e/src/app.e2e-spec.ts diff --git a/internal/tools/ui/e2e/src/app.po.ts b/internal/crawl/ui/e2e/src/app.po.ts similarity index 100% rename from internal/tools/ui/e2e/src/app.po.ts rename to internal/crawl/ui/e2e/src/app.po.ts diff --git a/internal/tools/ui/e2e/tsconfig.json b/internal/crawl/ui/e2e/tsconfig.json similarity index 100% rename from internal/tools/ui/e2e/tsconfig.json rename to internal/crawl/ui/e2e/tsconfig.json diff --git a/internal/tools/ui/karma.conf.js b/internal/crawl/ui/karma.conf.js similarity index 100% rename from internal/tools/ui/karma.conf.js rename to internal/crawl/ui/karma.conf.js diff --git a/internal/tools/ui/nginx.conf b/internal/crawl/ui/nginx.conf similarity index 100% rename from internal/tools/ui/nginx.conf rename to internal/crawl/ui/nginx.conf diff --git a/internal/tools/ui/package-lock.json b/internal/crawl/ui/package-lock.json similarity index 100% rename from internal/tools/ui/package-lock.json rename to internal/crawl/ui/package-lock.json diff --git a/internal/tools/ui/package.json b/internal/crawl/ui/package.json similarity index 100% rename from internal/tools/ui/package.json rename to internal/crawl/ui/package.json diff --git a/internal/tools/ui/src/app/app.component.css b/internal/crawl/ui/src/app/app.component.css similarity index 100% rename from internal/tools/ui/src/app/app.component.css rename to internal/crawl/ui/src/app/app.component.css diff --git a/internal/tools/ui/src/app/app.component.html b/internal/crawl/ui/src/app/app.component.html similarity index 100% rename from internal/tools/ui/src/app/app.component.html rename to internal/crawl/ui/src/app/app.component.html diff --git a/internal/tools/ui/src/app/app.component.spec.ts b/internal/crawl/ui/src/app/app.component.spec.ts similarity index 100% rename from internal/tools/ui/src/app/app.component.spec.ts rename to internal/crawl/ui/src/app/app.component.spec.ts diff --git a/internal/tools/ui/src/app/app.component.ts b/internal/crawl/ui/src/app/app.component.ts similarity index 100% rename from internal/tools/ui/src/app/app.component.ts rename to internal/crawl/ui/src/app/app.component.ts diff --git a/internal/tools/ui/src/app/app.module.ts b/internal/crawl/ui/src/app/app.module.ts similarity index 100% rename from internal/tools/ui/src/app/app.module.ts rename to internal/crawl/ui/src/app/app.module.ts diff --git a/internal/tools/ui/src/app/documents.ts b/internal/crawl/ui/src/app/documents.ts similarity index 100% rename from internal/tools/ui/src/app/documents.ts rename to internal/crawl/ui/src/app/documents.ts diff --git a/internal/tools/ui/src/app/histogram/histogram.component.css b/internal/crawl/ui/src/app/histogram/histogram.component.css similarity index 100% rename from internal/tools/ui/src/app/histogram/histogram.component.css rename to internal/crawl/ui/src/app/histogram/histogram.component.css diff --git a/internal/tools/ui/src/app/histogram/histogram.component.html b/internal/crawl/ui/src/app/histogram/histogram.component.html similarity index 100% rename from internal/tools/ui/src/app/histogram/histogram.component.html rename to internal/crawl/ui/src/app/histogram/histogram.component.html diff --git a/internal/tools/ui/src/app/histogram/histogram.component.spec.ts b/internal/crawl/ui/src/app/histogram/histogram.component.spec.ts similarity index 100% rename from internal/tools/ui/src/app/histogram/histogram.component.spec.ts rename to internal/crawl/ui/src/app/histogram/histogram.component.spec.ts diff --git a/internal/tools/ui/src/app/histogram/histogram.component.ts b/internal/crawl/ui/src/app/histogram/histogram.component.ts similarity index 100% rename from internal/tools/ui/src/app/histogram/histogram.component.ts rename to internal/crawl/ui/src/app/histogram/histogram.component.ts diff --git a/internal/tools/ui/src/app/search/search.component.css b/internal/crawl/ui/src/app/search/search.component.css similarity index 100% rename from internal/tools/ui/src/app/search/search.component.css rename to internal/crawl/ui/src/app/search/search.component.css diff --git a/internal/tools/ui/src/app/search/search.component.html b/internal/crawl/ui/src/app/search/search.component.html similarity index 100% rename from internal/tools/ui/src/app/search/search.component.html rename to internal/crawl/ui/src/app/search/search.component.html diff --git a/internal/tools/ui/src/app/search/search.component.spec.ts b/internal/crawl/ui/src/app/search/search.component.spec.ts similarity index 100% rename from internal/tools/ui/src/app/search/search.component.spec.ts rename to internal/crawl/ui/src/app/search/search.component.spec.ts diff --git a/internal/tools/ui/src/app/search/search.component.ts b/internal/crawl/ui/src/app/search/search.component.ts similarity index 100% rename from internal/tools/ui/src/app/search/search.component.ts rename to internal/crawl/ui/src/app/search/search.component.ts diff --git a/internal/tools/ui/src/app/search/search.service.ts b/internal/crawl/ui/src/app/search/search.service.ts similarity index 100% rename from internal/tools/ui/src/app/search/search.service.ts rename to internal/crawl/ui/src/app/search/search.service.ts diff --git a/internal/tools/ui/src/app/timeseries/timeseries.component.css b/internal/crawl/ui/src/app/timeseries/timeseries.component.css similarity index 100% rename from internal/tools/ui/src/app/timeseries/timeseries.component.css rename to internal/crawl/ui/src/app/timeseries/timeseries.component.css diff --git a/internal/tools/ui/src/app/timeseries/timeseries.component.html b/internal/crawl/ui/src/app/timeseries/timeseries.component.html similarity index 100% rename from internal/tools/ui/src/app/timeseries/timeseries.component.html rename to internal/crawl/ui/src/app/timeseries/timeseries.component.html diff --git a/internal/tools/ui/src/app/timeseries/timeseries.component.spec.ts b/internal/crawl/ui/src/app/timeseries/timeseries.component.spec.ts similarity index 100% rename from internal/tools/ui/src/app/timeseries/timeseries.component.spec.ts rename to internal/crawl/ui/src/app/timeseries/timeseries.component.spec.ts diff --git a/internal/tools/ui/src/app/timeseries/timeseries.component.ts b/internal/crawl/ui/src/app/timeseries/timeseries.component.ts similarity index 100% rename from internal/tools/ui/src/app/timeseries/timeseries.component.ts rename to internal/crawl/ui/src/app/timeseries/timeseries.component.ts diff --git a/internal/tools/ui/src/assets/.gitkeep b/internal/crawl/ui/src/assets/.gitkeep similarity index 100% rename from internal/tools/ui/src/assets/.gitkeep rename to internal/crawl/ui/src/assets/.gitkeep diff --git a/internal/tools/ui/src/environments/environment.prod.ts b/internal/crawl/ui/src/environments/environment.prod.ts similarity index 100% rename from internal/tools/ui/src/environments/environment.prod.ts rename to internal/crawl/ui/src/environments/environment.prod.ts diff --git a/internal/tools/ui/src/environments/environment.ts b/internal/crawl/ui/src/environments/environment.ts similarity index 100% rename from internal/tools/ui/src/environments/environment.ts rename to internal/crawl/ui/src/environments/environment.ts diff --git a/internal/tools/ui/src/favicon.ico b/internal/crawl/ui/src/favicon.ico similarity index 100% rename from internal/tools/ui/src/favicon.ico rename to internal/crawl/ui/src/favicon.ico diff --git a/internal/tools/ui/src/index.html b/internal/crawl/ui/src/index.html similarity index 100% rename from internal/tools/ui/src/index.html rename to internal/crawl/ui/src/index.html diff --git a/internal/tools/ui/src/main.ts b/internal/crawl/ui/src/main.ts similarity index 100% rename from internal/tools/ui/src/main.ts rename to internal/crawl/ui/src/main.ts diff --git a/internal/tools/ui/src/polyfills.ts b/internal/crawl/ui/src/polyfills.ts similarity index 100% rename from internal/tools/ui/src/polyfills.ts rename to internal/crawl/ui/src/polyfills.ts diff --git a/internal/tools/ui/src/styles.css b/internal/crawl/ui/src/styles.css similarity index 100% rename from internal/tools/ui/src/styles.css rename to internal/crawl/ui/src/styles.css diff --git a/internal/tools/ui/src/test.ts b/internal/crawl/ui/src/test.ts similarity index 100% rename from internal/tools/ui/src/test.ts rename to internal/crawl/ui/src/test.ts diff --git a/internal/tools/ui/tsconfig.app.json b/internal/crawl/ui/tsconfig.app.json similarity index 100% rename from internal/tools/ui/tsconfig.app.json rename to internal/crawl/ui/tsconfig.app.json diff --git a/internal/tools/ui/tsconfig.json b/internal/crawl/ui/tsconfig.json similarity index 100% rename from internal/tools/ui/tsconfig.json rename to internal/crawl/ui/tsconfig.json diff --git a/internal/tools/ui/tsconfig.spec.json b/internal/crawl/ui/tsconfig.spec.json similarity index 100% rename from internal/tools/ui/tsconfig.spec.json rename to internal/crawl/ui/tsconfig.spec.json diff --git a/internal/tools/ui/tslint.json b/internal/crawl/ui/tslint.json similarity index 100% rename from internal/tools/ui/tslint.json rename to internal/crawl/ui/tslint.json diff --git a/tools/tools.go b/internal/tools/tools.go similarity index 100% rename from tools/tools.go rename to internal/tools/tools.go diff --git a/kustapiversion/main.go b/kustapiversion/main.go new file mode 100644 index 000000000..87a7982c7 --- /dev/null +++ b/kustapiversion/main.go @@ -0,0 +1,21 @@ +// Copyright 2019 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +// A dummy main to help with releasing the kustomize API module. +package main + +import ( + "fmt" + "os" + + "sigs.k8s.io/kustomize/v3/provenance" +) + +// TODO: delete this when we find a better way to generate release notes. +func main() { + fmt.Println(` +This 'main' exists only to make goreleaser create release notes for the API. +See https://github.com/goreleaser/goreleaser/issues/981 +and https://github.com/kubernetes-sigs/kustomize/tree/master/releasing`) + provenance.GetProvenance().Print(os.Stdout, false) +} diff --git a/kustomize/go.mod b/kustomize/go.mod index a664ab88d..2d0187842 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -6,12 +6,8 @@ require ( github.com/pkg/errors v0.8.1 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 - gopkg.in/inf.v0 v0.9.1 // indirect - sigs.k8s.io/kustomize/v3 v3.2.0 + sigs.k8s.io/kustomize/v3 v3.3.0 sigs.k8s.io/yaml v1.1.0 ) -// When tagging and releasing this module (the kustomize CLI), -// be sure to require a specific version of sig.k8s.io/kustomize -// above, and drop the following replace directive. -replace sigs.k8s.io/kustomize/v3 v3.2.0 => ../ +replace sigs.k8s.io/kustomize/v3 v3.3.0 => ../ diff --git a/kustomize/go.sum b/kustomize/go.sum index 033e5de26..482f1a7e1 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -33,6 +33,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.6+incompatible h1:tfrHha8zJ01ywiOEC1miGY8st1/igzWB8OmvPgoYX7w= +github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -76,8 +78,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -108,14 +108,22 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 h1:ScAXWS+TR6MZKex+7Z8rneuSJH+FSDqd6ocQyl+ZHo4= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9 h1:Dk8DO58y0wXeNG49dRqzf4HrZAK9lFfTgS/FNtB6NlM= github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0= +github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/securecookie v0.0.0-20160422134519-667fe4e3466a/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v0.0.0-20160922145804-ca9ada445741/go.mod h1:+WVp8kdw6VhyKExm03PAMRn2ZxnPtm58pV0dBVPdhHE= github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -128,9 +136,10 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 h1:/UewZcckqhvnnS0C6r3Sher2hSEbVmM6Ogpcjen08+Y= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -151,6 +160,8 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481 h1:IaSjLMT6WvkoZZjspGxy3rdaTEmWLoRm49WbtVUi9sA= +github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/matoous/godox v0.0.0-20190910121045-032ad8106c86/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -163,7 +174,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da h1:ZQGIPjr1iTtUPXZFk8WShqb5G+Qg65VHFLtSvmHh+Mw= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/monopole/mdrip v0.2.48/go.mod h1:rzORfdNQ63T/tS95GOFHB+I3OrT+Bjlk8krOc/QiL/8= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/monopole/mdrip v1.0.0/go.mod h1:N1/ppRG9CaPeUKAUHZ3dUlfOT81lTpKZLkyhCvTETwM= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -173,10 +186,12 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c h1:Hww8mOyEKTeON4bZn7F github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c h1:eSfnfIuwhxZyULg1NNuZycJcYkjYVGYe7FczwQReM6U= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -213,6 +228,7 @@ github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34c github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -290,6 +306,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190621203818-d432491b9138/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 h1:SW/0nsKCUaozCUtZTakri5laocGx/5bkDSSLrFUsa5s= golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -301,7 +318,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -349,12 +365,15 @@ k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyod k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92 h1:PgoMI/L1Nu5Vmvgm+vGheLuxKST8h6FMOqggyAFtHPc= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c= +k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 h1:5sW+fEHvlJI3Ngolx30CmubFulwH28DhKjGf70Xmtco= k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= sigs.k8s.io/kustomize/pluginator v1.0.0/go.mod h1:i8HdU5FdH1zDjCKiFf5CNl7slsc0QffyKsY2OuPynJ0= +sigs.k8s.io/kustomize/v3 v3.2.0/go.mod h1:ztX4zYc/QIww3gSripwF7TBOarBTm5BvyAMem0kCzOE= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/kustomize/internal/commands/version/version.go b/kustomize/internal/commands/version/version.go index e104a7540..f4600ff3a 100644 --- a/kustomize/internal/commands/version/version.go +++ b/kustomize/internal/commands/version/version.go @@ -7,7 +7,7 @@ import ( "io" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/provenance" + "sigs.k8s.io/kustomize/v3/provenance" ) // NewCmdVersion makes a new version command. diff --git a/kustomize/main.go b/kustomize/main.go index 9d32b5043..1bec068fd 100644 --- a/kustomize/main.go +++ b/kustomize/main.go @@ -1,6 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 +// The kustomize CLI. package main import ( diff --git a/pkg/target/chartinflatorplugin_test.go b/pkg/target/chartinflatorplugin_test.go index ca17d91b2..be0251a38 100644 --- a/pkg/target/chartinflatorplugin_test.go +++ b/pkg/target/chartinflatorplugin_test.go @@ -61,7 +61,7 @@ kind: Secret metadata: labels: app: release-name-minecraft - chart: minecraft-1.1.0 + chart: minecraft-1.1.1 heritage: Tiller release: release-name name: LOOOOOOOONG-release-name-minecraft @@ -74,7 +74,7 @@ metadata: volume.alpha.kubernetes.io/storage-class: default labels: app: release-name-minecraft - chart: minecraft-1.1.0 + chart: minecraft-1.1.1 heritage: Tiller release: release-name name: LOOOOOOOONG-release-name-minecraft-datadir @@ -90,7 +90,7 @@ kind: Service metadata: labels: app: release-name-minecraft - chart: minecraft-1.1.0 + chart: minecraft-1.1.1 heritage: Tiller release: release-name name: LOOOOOOOONG-release-name-minecraft diff --git a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go index 40f52c37c..0bd1575fd 100644 --- a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go +++ b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go @@ -42,7 +42,7 @@ kind: Secret metadata: labels: app: release-name-minecraft - chart: minecraft-1.1.0 + chart: minecraft-1.1.1 heritage: Tiller release: release-name name: release-name-minecraft @@ -55,7 +55,7 @@ metadata: volume.alpha.kubernetes.io/storage-class: default labels: app: release-name-minecraft - chart: minecraft-1.1.0 + chart: minecraft-1.1.1 heritage: Tiller release: release-name name: release-name-minecraft-datadir @@ -71,7 +71,7 @@ kind: Service metadata: labels: app: release-name-minecraft - chart: minecraft-1.1.0 + chart: minecraft-1.1.1 heritage: Tiller release: release-name name: release-name-minecraft diff --git a/pluginator/go.mod b/pluginator/go.mod index 2bcec7ea5..1a2e22596 100644 --- a/pluginator/go.mod +++ b/pluginator/go.mod @@ -3,3 +3,5 @@ module sigs.k8s.io/kustomize/pluginator go 1.12 require sigs.k8s.io/kustomize/v3 v3.3.0 + +replace sigs.k8s.io/kustomize/v3 v3.3.0 => ../ diff --git a/pluginator/go.sum b/pluginator/go.sum index 65301614b..7407e3111 100644 --- a/pluginator/go.sum +++ b/pluginator/go.sum @@ -78,8 +78,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -108,16 +106,22 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 h1:ScAXWS+TR6MZKex+7Z8rneuSJH+FSDqd6ocQyl+ZHo4= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9 h1:Dk8DO58y0wXeNG49dRqzf4HrZAK9lFfTgS/FNtB6NlM= github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0= github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/securecookie v0.0.0-20160422134519-667fe4e3466a/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v0.0.0-20160922145804-ca9ada445741/go.mod h1:+WVp8kdw6VhyKExm03PAMRn2ZxnPtm58pV0dBVPdhHE= github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -129,10 +133,10 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 h1:/UewZcckqhvnnS0C6r3Sher2hSEbVmM6Ogpcjen08+Y= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -167,8 +171,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da h1:ZQGIPjr1iTtUPXZFk8WShqb5G+Qg65VHFLtSvmHh+Mw= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/monopole/mdrip v0.2.48/go.mod h1:rzORfdNQ63T/tS95GOFHB+I3OrT+Bjlk8krOc/QiL/8= +github.com/monopole/mdrip v1.0.0/go.mod h1:N1/ppRG9CaPeUKAUHZ3dUlfOT81lTpKZLkyhCvTETwM= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -304,7 +309,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -352,6 +356,7 @@ k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyod k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92 h1:PgoMI/L1Nu5Vmvgm+vGheLuxKST8h6FMOqggyAFtHPc= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c= k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 h1:5sW+fEHvlJI3Ngolx30CmubFulwH28DhKjGf70Xmtco= k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4= @@ -360,8 +365,6 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jC mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= sigs.k8s.io/kustomize/pluginator v1.0.0/go.mod h1:i8HdU5FdH1zDjCKiFf5CNl7slsc0QffyKsY2OuPynJ0= sigs.k8s.io/kustomize/v3 v3.2.0/go.mod h1:ztX4zYc/QIww3gSripwF7TBOarBTm5BvyAMem0kCzOE= -sigs.k8s.io/kustomize/v3 v3.3.0 h1:xonXqm4Lpd17zGrLXX/3t81KeWNQIU/++Wo8LQohRns= -sigs.k8s.io/kustomize/v3 v3.3.0/go.mod h1:STVEDXXV/PoFIQPMI8uVcrYME/YnMIp1+lyBnK4xgik= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/pluginator/main.go b/pluginator/main.go index b4fdb4fac..bd1b7086b 100644 --- a/pluginator/main.go +++ b/pluginator/main.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -// See /plugin/doc.go for an explanation. +// A code generator. See /plugin/doc.go for an explanation. package main import ( @@ -14,6 +14,7 @@ import ( "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" "sigs.k8s.io/kustomize/v3/pkg/plugins" + "sigs.k8s.io/kustomize/v3/provenance" ) //go:generate stringer -type=pluginType @@ -43,6 +44,10 @@ func main() { fmt.Sprintf( "// Code generated by pluginator on %s; DO NOT EDIT.", root)) + w.write( + fmt.Sprintf( + "// pluginator %+v\n", provenance.GetProvenance())) + w.write("\n") w.write("package " + plugins.BuiltinPluginPackage) pType := unknown @@ -83,6 +88,7 @@ func main() { func inputFileRoot() string { n := os.Getenv("GOFILE") if !strings.HasSuffix(n, ".go") { + log.Printf("%+v\n", provenance.GetProvenance()) log.Fatalf("expecting .go suffix on %s", n) } return n[:len(n)-len(".go")] diff --git a/kustomize/provenance/provenance.go b/provenance/provenance.go similarity index 100% rename from kustomize/provenance/provenance.go rename to provenance/provenance.go diff --git a/releasing/README.md b/releasing/README.md index a2fee5310..56fe1f620 100644 --- a/releasing/README.md +++ b/releasing/README.md @@ -70,19 +70,15 @@ require sigs.k8s.io/kustomize/v4 v4.0.1 #### Release artifacts +This is a Go library only release, so the only +artifact per se is the repo tag, in the form `v4.3.2`, +that API clients can `require` from their `go.mod` file. + Release notes should appear on the [release page]. -[release notes generator]: https://github.com/kubernetes-sigs/controller-runtime/blob/master/hack/release/release-notes.sh - -> TODO: install a decent library [release notes generator]. -> Until then, just run something like -> ``` -> git log --pretty="%h - %s (%aN)" v3.1.0..v3.2.0 -> ``` -> and summarize the results via the [release page] UX. - -There's no binary, just a repo tag in the form `v4.3.2` -that others can `require` from their `go.mod` files. +There's an executable called `kustapiversion`, which, if +run, prints the API release provenance data, but it's of +no practical use to an API client. ### sigs.k8s.io/kustomize/pluginator @@ -201,7 +197,7 @@ fi Install [`cloud-build-local`], then run ``` -./releasing/localbuild.sh (kustomize|pluginator) +./releasing/localbuild.sh (kustomize|pluginator|api) ``` This should create release artifacts in a local directory. diff --git a/releasing/cloudbuild.sh b/releasing/cloudbuild.sh index 8ff684238..a3dccce57 100755 --- a/releasing/cloudbuild.sh +++ b/releasing/cloudbuild.sh @@ -7,16 +7,21 @@ set -x module=$1 shift +executable=$module if [ "$module" == "api" ]; then - echo "goreleaser only releases 'main' packages (executables)" - echo "See https://github.com/goreleaser/goreleaser/issues/981" - exit 1 + # For this module, there's no correspondingly named + # sub-directory, since the module is at the repo root. + # There is, however, a dummy executable in a sub-directory. + # Build that executable, primarily to give goreleaser + # something to coordinate it release process around. + executable=kustapiversion fi -config=$(mktemp) +cd $executable -cat <$config -project_name: $module +configFile=$(mktemp) +cat <$configFile +project_name: $executable env: - CGO_ENABLED=0 - GO111MODULE=on @@ -34,29 +39,14 @@ release: github: owner: kubernetes-sigs name: kustomize -EOF +builds: +- binary: $executable + ldflags: > + -s + -X sigs.k8s.io/kustomize/v3/provenance.version={{.Version}} + -X sigs.k8s.io/kustomize/v3/provenance.gitCommit={{.Commit}} + -X sigs.k8s.io/kustomize/v3/provenance.buildDate={{.Date}} -case "$module" in - kustomize) - cat <>$config -builds: -- main: ./main.go - binary: kustomize - ldflags: -s -X sigs.k8s.io/kustomize/kustomize/v3/provenance.version={{.Version}} -X sigs.k8s.io/kustomize/kustomize/v3/provenance.gitCommit={{.Commit}} -X sigs.k8s.io/kustomize/kustomize/v3/provenance.buildDate={{.Date}} - goos: - - linux - - darwin - - windows - goarch: - - amd64 -archive: - format: binary -EOF - ;; - pluginator) - cat <>$config -builds: -- binary: pluginator goos: - linux - darwin @@ -64,20 +54,9 @@ builds: goarch: - amd64 EOF - ;; - *) - echo "Don't recognize module $module" - exit 1 - ;; -esac -cat $config +cat $configFile -if [ "$module" != "api" ]; then - # goreleaser must be run from the _module_ being released. - cd $module -fi - -/bin/goreleaser release --config=$config --rm-dist --skip-validate $@ +/bin/goreleaser release --config=$configFile --rm-dist --skip-validate $@ diff --git a/releasing/cloudbuild_api.yaml b/releasing/cloudbuild_api.yaml new file mode 100644 index 000000000..3f706890f --- /dev/null +++ b/releasing/cloudbuild_api.yaml @@ -0,0 +1,11 @@ +steps: +- name: "gcr.io/cloud-builders/git" + args: [fetch, --tags, --depth=100] +- name: goreleaser/goreleaser + entrypoint: /bin/sh + args: ["releasing/cloudbuild.sh", "api"] + secretEnv: ['GITHUB_TOKEN'] +secrets: +- kmsKeyName: projects/kustomize-199618/locations/global/keyRings/github-tokens/cryptoKeys/gh-release-token + secretEnv: + GITHUB_TOKEN: CiQAyrREbPgXJOeT7M3t+WlxkhXwlMPudixBeiyWTjmLOMLqdK4SUQA0W+xUmDJKAhyfHCcwqSEzUn9OwKC7XAYcmwe0CCKTCbPbDgmioDK24q3LVapndXNvnnHvCjhOJNEr1o+P1DCF+LlzYV2YL8lP09rrKrslPg== diff --git a/releasing/localbuild.sh b/releasing/localbuild.sh index e9e2d9b82..79873f2a8 100755 --- a/releasing/localbuild.sh +++ b/releasing/localbuild.sh @@ -17,8 +17,8 @@ # applied to the kustomize repo, the cloud builder # reads the repository-relative file # -# releasing/cloudbuild_(kustomize|pluginator).yaml -# +# releasing/cloudbuild_(kustomize|pluginator|api).yaml +# # Inside this yaml file is a reference to the script # # releasing/cloudbuild.sh @@ -34,9 +34,6 @@ set -e module=$1 case "$module" in api) - echo "goreleaser only releases 'main' packages (executables)" - echo "See https://github.com/goreleaser/goreleaser/issues/981" - exit 1 ;; kustomize) ;; @@ -51,7 +48,8 @@ esac config=$(mktemp) cp releasing/cloudbuild_${module}.yaml $config -# Delete the cloud-builders/git step. +# Delete the cloud-builders/git step, which isn't needed +# for a local run. sed -i '2,3d' $config # Add the --snapshot flag to suppress the @@ -74,5 +72,9 @@ cloud-build-local \ echo " " echo "Result of local build:" echo "##########################################" -tree ./$module/dist +if [ "$module" == "api" ]; then + tree ./kustapiversion/dist +else + tree ./$module/dist +fi echo "##########################################"