Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Remove unintentional argoproj/argo dependency

Browse source
This commit is contained in:
Jesse Suen 2018-02-16 14:03:27 -08:00
parent 2ef524d8d4
commit 70f6c37ca0
No known key found for this signature in database
GPG key ID: 95AE9BEA7206422B
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gopkg.lock generated
View file

@ -19,12 +19,6 @@
packages = ["."]
revision = "de5bf2ad457846296e2031421a34e2568e304e35"
[[projects]]
name = "github.com/argoproj/argo"
packages = [".","pkg/apis/workflow"]
revision = "0978b9c61cb7435d31ef8d252b80e03708a70adc"
version = "v2.0.0"
[[projects]]
name = "github.com/cockroachdb/cockroach"
packages = ["pkg/util/httputil","pkg/util/protoutil","pkg/util/syncutil"]
@ -316,6 +310,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "be9bff72b9e9e5876f18eaa46b8531836d6473939ad3ace65c77a267e40d64fd"
inputs-digest = "5b082aff7213e756664250a65e0d21d43ddc5062f0e6cd2186c9c6352dd5ef53"
solver-name = "gps-cdcl"
solver-version = 1

5
cmd/argocd/commands/install.go
View file

@ -6,7 +6,6 @@ import (
"github.com/argoproj/argo-cd/pkg/apis/application"
appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo/pkg/apis/workflow"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
@ -73,12 +72,12 @@ func installCRD(clientset *kubernetes.Clientset, extensionsClient *apiextensions
if !apierr.IsAlreadyExists(err) {
log.Fatalf("Failed to create CustomResourceDefinition: %v", err)
}
fmt.Printf("CustomResourceDefinition '%s' already exists\n", workflow.FullName)
fmt.Printf("CustomResourceDefinition '%s' already exists\n", application.FullName)
}
// wait for CRD being established
var crd *apiextensionsv1beta1.CustomResourceDefinition
err = wait.Poll(500*time.Millisecond, 60*time.Second, func() (bool, error) {
crd, err = extensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Get(workflow.FullName, metav1.GetOptions{})
crd, err = extensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Get(application.FullName, metav1.GetOptions{})
if err != nil {
return false, err
}

4
util/cmd/cmd.go
View file

@ -5,7 +5,7 @@ package cmd
import (
"fmt"
"github.com/argoproj/argo"
argocd "github.com/argoproj/argo-cd"
"github.com/spf13/cobra"
)
@ -16,7 +16,7 @@ func NewVersionCmd(cliName string) *cobra.Command {
Use: "version",
Short: fmt.Sprintf("Print version information"),
Run: func(cmd *cobra.Command, args []string) {
version := argo.GetVersion()
version := argocd.GetVersion()
fmt.Printf("%s: %s\n", cliName, version)
if short {
return