Update artefacts after moving repo to Helm Org

Signed-off-by: Martin Hickey <[email protected]>
danespinoza94 · Aug 31, 2021 · e9a12fa · e9a12fa
1 parent 27c87f9
commit e9a12fa
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,15 +12,15 @@ jobs:
             shellcheck -x scripts/install_plugin.sh
   untagged-build:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/hickeyma/helm-mapkubeapis
+      - image: circleci/golang:1.16
+    working_directory: /go/src/github.com/helm/helm-mapkubeapis
     steps:
       - checkout
       - run: make build
   tagged-build:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/hickeyma/helm-mapkubeapis
+      - image: circleci/golang:1.16
+    working_directory: /go/src/github.com/helm/helm-mapkubeapis
     steps:
       - checkout
       - run: curl -sL https://raw.githubusercontent.com/goreleaser/get/master/get | VERSION=v0.117.2 bash

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# Contributing Guidelines
+
+The Helm mapkubeapis plugin project accepts contributions via GitHub pull requests.
diff --git a/OWNERS b/OWNERS
@@ -0,0 +1,11 @@
+maintainers:
+  - adamreese
+  - bacongobbler
+  - hickeyma
+  - jdolitsky
+  - mattfarina
+  - prydonius
+  - rimusz
+  - scottrigby
+  - technosophos
+  - unguiculus
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # Helm mapkubeapis Plugin
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Go Report Card](https://goreportcard.com/badge/github.com/hickeyma/helm-mapkubeapis)](https://goreportcard.com/report/github.com/hickeyma/helm-mapkubeapis)
-[![CircleCI](https://circleci.com/gh/hickeyma/helm-mapkubeapis/tree/master.svg?style=svg)](https://circleci.com/gh/hickeyma/helm-mapkubeapis/tree/master)
-[![Release](https://img.shields.io/github/release/hickeyma/helm-mapkubeapis.svg?style=flat-square)](https://github.com/hickeyma/helm-mapkubeapis/releases/latest)
+[![Go Report Card](https://goreportcard.com/badge/github.com/helm/helm-mapkubeapis)](https://goreportcard.com/report/github.com/helm/helm-mapkubeapis)
+[![CircleCI](https://circleci.com/gh/helm/helm-mapkubeapis/tree/master.svg?style=svg)](https://circleci.com/gh/helm/helm-mapkubeapis/tree/master)
+[![Release](https://img.shields.io/github/release/helm/helm-mapkubeapis.svg?style=flat-square)](https://github.com/helm/helm-mapkubeapis/releases/latest)
 
 `mapkubeapis` is a Helm v2/v3 plugin which updates in-place Helm release metadata that contains deprecated or removed Kubernetes APIs to a new instance with supported Kubernetes APIs. Jump to [background to the issue](#background-to-the-issue) for more details on the problem space that the plugin solves.
 
@@ -24,9 +24,9 @@
 Based on the version in `plugin.yaml`, release binary will be downloaded from GitHub:
 
 ```console
-$ helm plugin install https://github.com/hickeyma/helm-mapkubeapis
-Downloading and installing helm-mapkubeapis v0.0.1 ...
-https://github.com/hickeyma/helm-mapkubeapis/releases/download/v0.0.1/helm-mapkubeapis_0.0.1_darwin_amd64.tar.gz
+$ helm plugin install https://github.com/helm/helm-mapkubeapis
+Downloading and installing helm-mapkubeapis v0.1.0 ...
+https://github.com/helm/helm-mapkubeapis/releases/download/v0.1.0/helm-mapkubeapis_0.1.0_darwin_amd64.tar.gz
 Installed plugin: mapkubeapis
 ```
 
@@ -36,7 +36,7 @@ Helm's plugin install hook system relies on `/bin/sh`, regardless of the operati
 ```
 $ wget https://get.helm.sh/helm-v3.0.0-linux-amd64.tar.gz
 $ tar xzf helm-v3.0.0-linux-amd64.tar.gz
-$ ./linux-amd64/helm plugin install https://github.com/hickeyma/helm-mapkubeapis
+$ ./linux-amd64/helm plugin install https://github.com/helm/helm-mapkubeapis
 ```
 
 ## Usage
@@ -90,7 +90,7 @@ kind: Ingress"
 ```
 ## API Mapping
 
-The mapping information of deprecated or removed APIs to supported APIs is configured in the [Map.yaml](https://github.com/hickeyma/helm-mapkubeapis/blob/master/config/Map.yaml) file. The file is a list of entries similar to the following:
+The mapping information of deprecated or removed APIs to supported APIs is configured in the [Map.yaml](https://github.com/helm/helm-mapkubeapis/blob/master/config/Map.yaml) file. The file is a list of entries similar to the following:
 
 ```yaml
  - deprecatedAPI: "apiVersion: extensions/v1beta1\nkind: Deployment"
@@ -124,12 +124,12 @@ This is what the `mapkubeapis` plugin resolves. It fixes the issue by mapping re
 
 If you would like to handle the build yourself, this is the recommended way to do it.
 
-You must first have [Go v1.13](http://golang.org) installed, and then you run:
+You must first have [Go v1.13+](http://golang.org) installed, and then you run:
 
 ```console
 $ mkdir -p ${GOPATH}/src/github.com
 $ cd $_
-$ git clone [email protected]:hickeyma/helm-mapkubeapis.git
+$ git clone [email protected]:helm/helm-mapkubeapis.git
 $ cd helm-mapkubeapis
 $ make
 $ export HELM_LINTER_PLUGIN_NO_INSTALL_HOOK=true

diff --git a/cmd/mapkubeapis/map.go b/cmd/mapkubeapis/map.go
@@ -25,9 +25,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/hickeyma/helm-mapkubeapis/pkg/common"
-	v2 "github.com/hickeyma/helm-mapkubeapis/pkg/v2"
-	v3 "github.com/hickeyma/helm-mapkubeapis/pkg/v3"
+	"github.com/helm/helm-mapkubeapis/pkg/common"
+	v2 "github.com/helm/helm-mapkubeapis/pkg/v2"
+	v3 "github.com/helm/helm-mapkubeapis/pkg/v3"
 )
 
 // MapOptions contains the options for Map operation

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -0,0 +1,3 @@
+# Community Code of Conduct
+
+Helm follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
-module github.com/hickeyma/helm-mapkubeapis
+module github.com/helm/helm-mapkubeapis
 
-go 1.13
+go 1.16
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect

diff --git a/go.sum b/go.sum
@@ -82,11 +82,9 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
@@ -196,7 +194,6 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
@@ -287,7 +284,6 @@ github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
-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-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -461,7 +457,6 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f h1:2+myh5ml7lgEU/51gbeLHfKGNfgEQQIWrlbdaOsidbQ=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=

diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/mod/semver"
 
-	"github.com/hickeyma/helm-mapkubeapis/pkg/mapping"
+	"github.com/helm/helm-mapkubeapis/pkg/mapping"
 )
 
 // KubeConfig are the Kubernetes configuration settings

diff --git a/pkg/v2/release.go b/pkg/v2/release.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/timeconv"
 
-	common "github.com/hickeyma/helm-mapkubeapis/pkg/common"
+	common "github.com/helm/helm-mapkubeapis/pkg/common"
 )
 
 // MapReleaseWithUnSupportedAPIs checks the latest release version for any deprecated or removed APIs in its metadata

diff --git a/pkg/v2/storage.go b/pkg/v2/storage.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/storage/driver"
 
-	common "github.com/hickeyma/helm-mapkubeapis/pkg/common"
+	common "github.com/helm/helm-mapkubeapis/pkg/common"
 )
 
 // GetStorageDriver return handle to Helm v2 backend storage driver

diff --git a/pkg/v3/connect.go b/pkg/v3/connect.go
@@ -24,7 +24,7 @@ import (
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/cli"
 
-	common "github.com/hickeyma/helm-mapkubeapis/pkg/common"
+	common "github.com/helm/helm-mapkubeapis/pkg/common"
 )
 
 var (

diff --git a/pkg/v3/release.go b/pkg/v3/release.go
@@ -25,7 +25,7 @@ import (
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/release"
 
-	common "github.com/hickeyma/helm-mapkubeapis/pkg/common"
+	common "github.com/helm/helm-mapkubeapis/pkg/common"
 )
 
 // MapReleaseWithUnSupportedAPIs checks the latest release version for any deprecated or removed APIs in its metadata

diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: "mapkubeapis"
-version: "0.0.15"
+version: "0.1.0"
 usage: "Map release deprecated Kubernetes APIs in-place"
 description: "Map release deprecated Kubernetes APIs in-place"
 command: "$HELM_PLUGIN_DIR/bin/mapkubeapis"

diff --git a/scripts/install_plugin.sh b/scripts/install_plugin.sh
@@ -11,15 +11,15 @@ echo "Downloading and installing helm-mapkubeapis v${version} ..."
 
 url=""
 if [ "$(uname)" = "Darwin" ]; then
-    url="https://github.com/hickeyma/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_darwin_amd64.tar.gz"
+    url="https://github.com/helm/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_darwin_amd64.tar.gz"
 elif [ "$(uname)" = "Linux" ] ; then
     if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then
-        url="https://github.com/hickeyma/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_linux_arm64.tar.gz"
+        url="https://github.com/helm/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_linux_arm64.tar.gz"
     else
-        url="https://github.com/hickeyma/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_linux_amd64.tar.gz"
+        url="https://github.com/helm/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_linux_amd64.tar.gz"
     fi
 else
-    url="https://github.com/hickeyma/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_windows_amd64.tar.gz"
+    url="https://github.com/helm/helm-mapkubeapis/releases/download/v${version}/helm-mapkubeapis_${version}_windows_amd64.tar.gz"
 fi
 
 echo "$url"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Contributing Guidelines

		The Helm mapkubeapis plugin project accepts contributions via GitHub pull requests.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Community Code of Conduct

		Helm follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).