From f82b2ccf8607632cf754b41465650e3e4eea4dbe Mon Sep 17 00:00:00 2001 From: Vivek Lakshmanan Date: Wed, 27 Oct 2021 09:47:44 -0700 Subject: [PATCH] Avoid double install of dependencies (#230) * Avoid double install of dependencies * Add changelog * Bump p/p to 3.16.0 --- CHANGELOG.md | 3 ++- Dockerfile | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/controller/stack/stack_controller.go | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78a1745b..558ceba1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ CHANGELOG ========= ## HEAD (Unreleased) -(None) +- Avoid double install of dependencies [#230](https://github.com/pulumi/pulumi-kubernetes-operator/pull/230) +- Update to v3.16.0 of Pulumi [#230](https://github.com/pulumi/pulumi-kubernetes-operator/pull/230) ## 1.0.0 (2021-10-12) **First GA release** diff --git a/Dockerfile b/Dockerfile index 8f868a68..114c6a7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM pulumi/pulumi:v3.14.0 +FROM pulumi/pulumi:v3.16.0 ENV OPERATOR=/usr/local/bin/pulumi-kubernetes-operator diff --git a/go.mod b/go.mod index 6337dffa..ff392405 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/prometheus/client_golang v1.11.0 github.com/prometheus/common v0.30.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect - github.com/pulumi/pulumi/sdk/v3 v3.14.1-0.20211008214310-a9a62bd76177 + github.com/pulumi/pulumi/sdk/v3 v3.16.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 github.com/whilp/git-urls v1.0.0 diff --git a/go.sum b/go.sum index 3bc1abfe..d10df858 100644 --- a/go.sum +++ b/go.sum @@ -884,8 +884,8 @@ github.com/prometheus/prometheus v0.0.0-20180315085919-58e2a31db8de/go.mod h1:oA github.com/prometheus/prometheus v1.8.2-0.20200110114423-1e64d757f711/go.mod h1:7U90zPoLkWjEIQcy/rweQla82OCTUzxVHE51G3OhJbI= github.com/prometheus/prometheus v2.3.2+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pulumi/pulumi/sdk/v3 v3.14.1-0.20211008214310-a9a62bd76177 h1:H5zn9PMJKoOHHKCGCRX74FAoItkA8/M1IItFcwutv2g= -github.com/pulumi/pulumi/sdk/v3 v3.14.1-0.20211008214310-a9a62bd76177/go.mod h1:aT7YmFdR6/T7tp2tMIZ68WRD1Xyv5a6Y4BhsuaCNpW0= +github.com/pulumi/pulumi/sdk/v3 v3.16.0 h1:yqGysCf1LqlkengBnYqcbl5JI6JGySPN67+g60dMieU= +github.com/pulumi/pulumi/sdk/v3 v3.16.0/go.mod h1:252ou/zAU1g6E8iTwe2Y9ht7pb5BDl2fJlOuAgZCHiA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/robfig/cron v0.0.0-20170526150127-736158dc09e1/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= diff --git a/pkg/controller/stack/stack_controller.go b/pkg/controller/stack/stack_controller.go index f34220e9..961c6593 100644 --- a/pkg/controller/stack/stack_controller.go +++ b/pkg/controller/stack/stack_controller.go @@ -9,8 +9,6 @@ import ( "encoding/base64" "encoding/json" "fmt" - "github.com/pulumi/pulumi-kubernetes-operator/pkg/apis/pulumi/shared" - pulumiv1 "github.com/pulumi/pulumi-kubernetes-operator/pkg/apis/pulumi/v1" "io" "os" "os/exec" @@ -19,6 +17,9 @@ import ( "strings" "time" + "github.com/pulumi/pulumi-kubernetes-operator/pkg/apis/pulumi/shared" + pulumiv1 "github.com/pulumi/pulumi-kubernetes-operator/pkg/apis/pulumi/v1" + "github.com/operator-framework/operator-lib/handler" libpredicate "github.com/operator-framework/operator-lib/predicate" "github.com/pkg/errors" @@ -629,7 +630,6 @@ func (sess *reconcileStackSession) SetupPulumiWorkdir(gitAuth *auto.GitAuth) err ProjectPath: sess.stack.RepoDir, CommitHash: sess.stack.Commit, Branch: sess.stack.Branch, - Setup: sess.InstallProjectDependencies, Auth: gitAuth, }