resolve merge conflict

Signed-off-by: Remington Breeze <remington@breeze.software>

Makefile

@@ -225,7 +225,7 @@ test-e2e: install-devtools-local
 
 .PHONY: test-unit
  test-unit: install-devtools-local
-	${DIST_DIR}/gotestsum --junitfile=junit.xml --format=testname -- -covermode=count -coverprofile=coverage.out `go list ./... | grep -v ./test/cmd/sample-metrics-plugin`
+	${DIST_DIR}/gotestsum --junitfile=junit.xml --format=testname -- -covermode=count -coverprofile=coverage.out `go list ./... | grep -v ./test/cmd/metrics-plugin-sample`
 
 
 .PHONY: coverage
@@ -284,9 +284,9 @@ checksums:
 # https://www.jetbrains.com/help/go/attach-to-running-go-processes-with-debugger.html
 .PHONY: build-sample-metric-plugin-debug
 build-sample-metric-plugin-debug:
-	go build -gcflags="all=-N -l" -o metric-plugin test/cmd/sample-metrics-plugin/main.go
+	go build -gcflags="all=-N -l" -o metric-plugin test/cmd/metrics-plugin-sample/main.go
 
 .PHONY: build-sample-traffic-plugin-debug
 build-sample-traffic-plugin-debug:
-	go build -gcflags="all=-N -l" -o traffic-plugin test/cmd/sample-trafficrouter-plugin/main.go
+	go build -gcflags="all=-N -l" -o traffic-plugin test/cmd/trafficrouter-plugin-sample/main.go
 

USERS.md

@@ -11,6 +11,7 @@ Organizations below are **officially** using Argo Rollouts. Please send a PR wit
 1. [Calm](https://www.calm.com/)
 1. [Codefresh](https://codefresh.io/)
 1. [Credit Karma](https://creditkarma.com/)
+1. [DaoCloud](https://daocloud.io)
 1. [Databricks](https://github.com/databricks)
 1. [Devtron Labs](https://github.com/devtron-labs/devtron)
 1. [Farfetch](https://www.farfetch.com/)

docs/analysis/plugins.md

@@ -2,10 +2,10 @@
 
 !!! important Available since v1.5 - Status: Alpha
 
-Argo Rollouts supports getting analysis metrics via 3rd party plugin system. This allows users to extend the capabilities of Rollouts 
+Argo Rollouts supports getting analysis metrics via 3rd party plugin system. This allows users to extend the capabilities of Rollouts
 to support metric providers that are not natively supported. Rollout's uses a plugin library called
-[go-plugin](https://github.com/hashicorp/go-plugin) to do this. You can find a sample plugin 
-here: [rollouts-sample_prometheus-metric-plugin](https://github.com/argoproj-labs/rollouts-sample_prometheus-metric-plugin)
+[go-plugin](https://github.com/hashicorp/go-plugin) to do this. You can find a sample plugin
+here: [rollouts-plugin-metric-sample-prometheus](https://github.com/argoproj-labs/rollouts-plugin-metric-sample-prometheus)
 
 ## Using a Metric Plugin
 
@@ -36,7 +36,7 @@ data:
 
 ### Using a HTTP(S) server to host the plugin executable
 
-Argo Rollouts supports downloading the plugin executable from a HTTP(S) server. To use this method, you will need to 
+Argo Rollouts supports downloading the plugin executable from a HTTP(S) server. To use this method, you will need to
 configure the controller via the `argo-rollouts-config` configmap and set `pluginLocation` to a http(s) url. Example:
 
 ```yaml
@@ -47,7 +47,7 @@ metadata:
 data:
   metricProviderPlugins: |-
     - name: "argoproj-labs/sample-prometheus" # name of the plugin, it must match the name required by the plugin so it can find it's configuration
-      location: "https://github.com/argoproj-labs/rollouts-sample_prometheus-metric-plugin/releases/download/v0.0.4/metric-plugin-linux-amd64" # supports http(s):// urls and file://
+      location: "https://github.com/argoproj-labs/rollouts-plugin-metric-sample-prometheus/releases/download/v0.0.4/metric-plugin-linux-amd64" # supports http(s):// urls and file://
       sha256: "dac10cbf57633c9832a17f8c27d2ca34aa97dd3d" #optional sha256 checksum of the plugin executable
 ```
 
@@ -56,18 +56,18 @@ data:
 Depending on which method you use to install and the plugin, there are some things to be aware of.
 The rollouts controller will not start if it can not download or find the plugin executable. This means that if you are using
 a method of installation that requires a download of the plugin and the server hosting the plugin for some reason is not available and the rollouts
-controllers pod got deleted while the server was down or is coming up for the first time, it will not be able to start until 
+controllers pod got deleted while the server was down or is coming up for the first time, it will not be able to start until
 the server hosting the plugin is available again.
 
 Argo Rollouts will download the plugin at startup only once but if the pod is deleted it will need to download the plugin again on next startup. Running
 Argo Rollouts in HA mode can help a little with this situation because each pod will download the plugin at startup. So if a single pod gets
-deleted during a server outage, the other pods will still be able to take over because there will already be a plugin executable available to it. It is the 
+deleted during a server outage, the other pods will still be able to take over because there will already be a plugin executable available to it. It is the
 responsibility of the Argo Rollouts administrator to define the plugin installation method considering the risks of each approach.
 
 ## List of Available Plugins (alphabetical order)
 
 #### Add Your Plugin Here
   * If you have created a plugin, please submit a PR to add it to this list.
-#### [rollouts-sample_prometheus-metric-plugin](https://github.com/argoproj-labs/rollouts-sample_prometheus-metric-plugin)
-  * This is just a sample plugin that can be used as a starting point for creating your own plugin. 
+#### [rollouts-plugin-metric-sample-prometheus](https://github.com/argoproj-labs/rollouts-plugin-metric-sample-prometheus)
+  * This is just a sample plugin that can be used as a starting point for creating your own plugin.
 It is not meant to be used in production. It is based on the built-in prometheus provider.

docs/features/traffic-management/plugins.md

@@ -5,7 +5,7 @@
 Argo Rollouts supports getting analysis metrics via 3rd party plugin system. This allows users to extend the capabilities of Rollouts
 to support metric providers that are not natively supported. Rollout's uses a plugin library called
 [go-plugin](https://github.com/hashicorp/go-plugin) to do this. You can find a sample plugin
-here: [rollouts-sample_nginx-trafficrouter-plugin](https://github.com/argoproj-labs/rollouts-sample_nginx-trafficrouter-plugin)
+here: [rollouts-plugin-trafficrouter-sample-nginx](https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-sample-nginx)
 
 ## Using a Traffic Router Plugin
 
@@ -47,7 +47,7 @@ metadata:
 data:
   trafficRouterPlugins: |-
     - name: "argoproj-labs/sample-nginx" # name of the plugin, it must match the name required by the plugin so it can find it's configuration
-      location: "https://github.com/argoproj-labs/rollouts-sample_nginx-trafficrouter-plugin/releases/download/v0.0.1/metric-plugin-linux-amd64" # supports http(s):// urls and file://
+      location: "https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-sample-nginx/releases/download/v0.0.1/metric-plugin-linux-amd64" # supports http(s):// urls and file://
       sha256: "08f588b1c799a37bbe8d0fc74cc1b1492dd70b2c" #optional sha256 checksum of the plugin executable
 ```
 
@@ -68,6 +68,6 @@ responsibility of the Argo Rollouts administrator to define the plugin installat
 
 #### Add Your Plugin Here
 * If you have created a plugin, please submit a PR to add it to this list.
-#### [rollouts-sample_nginx-trafficrouter-plugin](https://github.com/argoproj-labs/rollouts-sample_nginx-trafficrouter-plugin)
+#### [rollouts-plugin-trafficrouter-sample-nginx](https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-sample-nginx)
 * This is just a sample plugin that can be used as a starting point for creating your own plugin.
   It is not meant to be used in production. It is based on the built-in prometheus provider.

docs/plugins.md

@@ -2,7 +2,7 @@
 
 ## High Level Overview
 
-Argo Rollouts plugins depend on hashicorp's [go-plugin](https://github.com/hashicorp/go-plugin) library. This library 
+Argo Rollouts plugins depend on hashicorp's [go-plugin](https://github.com/hashicorp/go-plugin) library. This library
 provides a way for a plugin to be compiled as a standalone executable and then loaded by the rollouts controller at runtime.
 This works by having the plugin executable act as a rpc server and the rollouts controller act as a client. The plugin executable
 is started by the rollouts controller and is a long-lived process and that the rollouts controller connects to over a unix socket.
@@ -11,22 +11,22 @@ The communication protocol uses golang built in net/rpc library so plugins have
 ## Plugin Repository
 
 In order to get plugins listed in the main argo rollouts documentation we ask that the plugin repository be created under
-the [argoproj-labs](https://github.com/argoproj-labs) organization. Please open an issue under argo-rollouts requesting a 
-repo which you would be granted admin access on. 
+the [argoproj-labs](https://github.com/argoproj-labs) organization. Please open an issue under argo-rollouts requesting a
+repo which you would be granted admin access on.
 
-There is also a standard naming convention for plugin names used for configmap registration, as well as what the plugin 
-uses for locating its specific configuration on rollout or analysis resources. The name needs to be in the form of 
-`<namespace>/<name>` and both <namespace> and <name> have a regular expression check that matches Github's requirements 
-for `username/org` and `repository name`. This requirement is in place to help with allowing multiple creators of the same plugin 
-types to exist such as `<org1>/nginx` and `<org2>/nginx`. These names could be based of the repo name such 
-as `argoproj-labs/rollouts-sample_prometheus-metric-plugin` but it is not a requirement. 
+There is also a standard naming convention for plugin names used for configmap registration, as well as what the plugin
+uses for locating its specific configuration on rollout or analysis resources. The name needs to be in the form of
+`<namespace>/<name>` and both <namespace> and <name> have a regular expression check that matches Github's requirements
+for `username/org` and `repository name`. This requirement is in place to help with allowing multiple creators of the same plugin
+types to exist such as `<org1>/nginx` and `<org2>/nginx`. These names could be based of the repo name such
+as `argoproj-labs/rollouts-plugin-metric-sample-prometheus` but it is not a requirement.
 
-There will also be a standard for naming repositories under argoproj-labs in the form of `rollouts-<tool>-<type>-plugin`
+There will also be a standard for naming repositories under argoproj-labs in the form of `rollouts-plugin-<type>-<tool>`
 where `<type>` is say `metric`, or `trafficrouter` and `<tool>` is the software the plugin is for say nginx.
 
 ## Plugin Name
 
-So now that we have an idea on plugin naming and repository standards let's pick a name to use for the rest of this 
+So now that we have an idea on plugin naming and repository standards let's pick a name to use for the rest of this
 documentation and call our plugin `argoproj-labs/nginx`.
 
 This name will be used in a few different spots the first is the config map that your plugin users will need to configure.
@@ -134,22 +134,22 @@ type TrafficRouterPlugin interface {
 
 ## Plugin Init Function
 
-Each plugin interface has a `InitPlugin` function, this function is called when the plugin is first started up and is only called 
-once per startup. The `InitPlugin` function is used as a means to initialize the plugin it gives you the plugin author the ability 
-to either set up a client for a specific metrics provider or in the case of a traffic router construct a client or informer 
+Each plugin interface has a `InitPlugin` function, this function is called when the plugin is first started up and is only called
+once per startup. The `InitPlugin` function is used as a means to initialize the plugin it gives you the plugin author the ability
+to either set up a client for a specific metrics provider or in the case of a traffic router construct a client or informer
 for kubernetes api. The one thing to note about this though is because these calls happen over RPC the plugin author should
 not depend on state being stored in the plugin struct as it will not be persisted between calls.
 
 ## Kubernetes RBAC
 
 The plugin runs as a child process of the rollouts controller and as such it will inherit the same RBAC permissions as the
-controller. This means that the service account for the rollouts controller will need the correct permissions for the plugin 
-to function. This might mean instructing users to create a role and role binding to the standard rollouts service account 
+controller. This means that the service account for the rollouts controller will need the correct permissions for the plugin
+to function. This might mean instructing users to create a role and role binding to the standard rollouts service account
 for the plugin to use. This will probably affect traffic router plugins more than metrics plugins.
 
 ## Sample Plugins
 
 There are two sample plugins within the argo-rollouts repo that you can use as a reference for creating your own plugin.
 
-* [Sample Metrics Plugin](https://github.com/argoproj/argo-rollouts/tree/master/test/cmd/sample-metrics-plugin)
-* [Sample Traffic Router Plugin](https://github.com/argoproj/argo-rollouts/tree/master/test/cmd/sample-trafficrouter-plugin)
+* [Metrics Plugin Sample](https://github.com/argoproj/argo-rollouts/tree/master/test/cmd/metrics-plugin-sample)
+* [Traffic Router Plugin Sample](https://github.com/argoproj/argo-rollouts/tree/master/test/cmd/trafficrouter-plugin-sample)

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/newrelic/newrelic-client-go v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_golang v1.15.0
 	github.com/prometheus/client_model v0.3.0
 	github.com/prometheus/common v0.42.0
 	github.com/prometheus/common/sigv4 v0.1.0
@@ -157,7 +157,7 @@ require (
 	github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.13 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/russross/blackfriday v1.6.0 // indirect
 	github.com/slack-go/slack v0.12.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect

go.sum

@@ -616,8 +616,8 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -796,8 +796,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM=
+github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -822,8 +822,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
+github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=

test/cmd/sample-metrics-plugin/main.go → test/cmd/metrics-plugin-sample/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/argoproj/argo-rollouts/metricproviders/plugin/rpc"
-	"github.com/argoproj/argo-rollouts/test/cmd/sample-metrics-plugin/internal/plugin"
+	"github.com/argoproj/argo-rollouts/test/cmd/metrics-plugin-sample/internal/plugin"
 	goPlugin "github.com/hashicorp/go-plugin"
 	log "github.com/sirupsen/logrus"
 )

test/cmd/sample-trafficrouter-plugin/main.go → test/cmd/trafficrouter-plugin-sample/main.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	rolloutsPlugin "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc"
-	"github.com/argoproj/argo-rollouts/test/cmd/sample-trafficrouter-plugin/internal/plugin"
+	"github.com/argoproj/argo-rollouts/test/cmd/trafficrouter-plugin-sample/internal/plugin"
 	goPlugin "github.com/hashicorp/go-plugin"
 	log "github.com/sirupsen/logrus"
 )