Skip to content

Commit f0d8d96

Browse files
joelanfordjoelanford
authored
pkg/ansible,pkg/helm: import client-go auth plugins (#1199)
* pkg/ansible,pkg/helm: import client-go auth plugins * pkg/scaffold/cmd.go: import all client-go auth plugins * pkg/*,commands/operator-sdk/main.go: move auth plugin imports to main funcs * commands/operator-sdk/,pkg/test,test/test-framework: import all auth plugins * pkg/scaffold/gopkgtoml.go: override census-instrumentation/opencensus-proto to v0.1.0 * Gopkg.toml: override github.com/census-instrumentation/opencensus-proto to v0.1.0
1 parent c412807 commit f0d8d96

File tree

175 files changed

+25851
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+25851
-8
lines changed

‎Gopkg.lock

Lines changed: 100 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@
2626
name = "k8s.io/kube-openapi"
2727
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
2828

29+
# This override is required due to unspecificed dependency versions in
30+
# contrib.go.opencensus.io/exporter/ocagent (v0.2.0), which is a dependency of
31+
# the Azure auth plugin. contrib.go.opencensus.io/exporter/ocagent depends on
32+
# (but does not declare a version constraint for) opencensus-proto. The most
33+
# recent release of opencensus-proto (v0.2.0) breaks ocagent, so we need to
34+
# override it back to a working release.
35+
[[override]]
36+
name = "github.com/census-instrumentation/opencensus-proto"
37+
version = "=v0.1.0"
38+
2939
[[constraint]]
3040
name = "sigs.k8s.io/controller-runtime"
3141
version = "=v0.1.10"

‎commands/operator-sdk/cmd/test/cluster.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3535
"k8s.io/apimachinery/pkg/util/wait"
3636
"k8s.io/client-go/kubernetes"
37-
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
3837
)
3938

4039
type testClusterConfig struct {

‎commands/operator-sdk/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ package main
1717
import (
1818
"os"
1919

20+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
21+
// to ensure that `run` and `up local` can make use of them.
22+
_ "k8s.io/client-go/plugin/pkg/client/auth"
23+
2024
"github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd"
2125
)
2226

‎pkg/scaffold/ansible/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ const mainTmpl = `package main
3838
import (
3939
"os"
4040
41+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
42+
_ "k8s.io/client-go/plugin/pkg/client/auth"
43+
4144
aoflags "github.com/operator-framework/operator-sdk/pkg/ansible/flags"
4245
"github.com/operator-framework/operator-sdk/pkg/ansible"
4346
"github.com/operator-framework/operator-sdk/pkg/log/zap"

‎pkg/scaffold/cmd.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ import (
4343
"os"
4444
"runtime"
4545
46+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
47+
_ "k8s.io/client-go/plugin/pkg/client/auth"
48+
4649
"{{ .Repo }}/pkg/apis"
4750
"{{ .Repo }}/pkg/controller"
4851
@@ -52,7 +55,6 @@ import (
5255
"github.com/operator-framework/operator-sdk/pkg/metrics"
5356
sdkVersion "github.com/operator-framework/operator-sdk/version"
5457
"github.com/spf13/pflag"
55-
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
5658
"sigs.k8s.io/controller-runtime/pkg/client/config"
5759
"sigs.k8s.io/controller-runtime/pkg/manager"
5860
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"

‎pkg/scaffold/cmd_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ import (
4242
"os"
4343
"runtime"
4444
45+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
46+
_ "k8s.io/client-go/plugin/pkg/client/auth"
47+
4548
"github.com/example-inc/app-operator/pkg/apis"
4649
"github.com/example-inc/app-operator/pkg/controller"
4750
@@ -51,7 +54,6 @@ import (
5154
"github.com/operator-framework/operator-sdk/pkg/metrics"
5255
sdkVersion "github.com/operator-framework/operator-sdk/version"
5356
"github.com/spf13/pflag"
54-
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
5557
"sigs.k8s.io/controller-runtime/pkg/client/config"
5658
"sigs.k8s.io/controller-runtime/pkg/manager"
5759
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"

‎pkg/scaffold/gopkgtoml.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ required = [
9595
name = "github.com/coreos/prometheus-operator"
9696
version = "=v0.26.0"
9797
98+
[[override]]
99+
name = "github.com/census-instrumentation/opencensus-proto"
100+
version = "=v0.1.0"
101+
98102
[[override]]
99103
name = "sigs.k8s.io/controller-runtime"
100104
version = "=v0.1.10"

‎pkg/scaffold/gopkgtoml_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ required = [
8787
name = "github.com/coreos/prometheus-operator"
8888
version = "=v0.26.0"
8989
90+
[[override]]
91+
name = "github.com/census-instrumentation/opencensus-proto"
92+
version = "=v0.1.0"
93+
9094
[[override]]
9195
name = "sigs.k8s.io/controller-runtime"
9296
version = "=v0.1.10"

‎pkg/scaffold/helm/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ const mainTmpl = `package main
3838
import (
3939
"os"
4040
41+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
42+
_ "k8s.io/client-go/plugin/pkg/client/auth"
43+
4144
hoflags "github.com/operator-framework/operator-sdk/pkg/helm/flags"
4245
"github.com/operator-framework/operator-sdk/pkg/helm"
4346
"github.com/operator-framework/operator-sdk/pkg/log/zap"

‎pkg/test/framework.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import (
2222
"sync"
2323
"time"
2424

25+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
26+
_ "k8s.io/client-go/plugin/pkg/client/auth"
27+
2528
k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
2629

2730
extscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
@@ -31,7 +34,6 @@ import (
3134
"k8s.io/client-go/discovery/cached"
3235
"k8s.io/client-go/kubernetes"
3336
cgoscheme "k8s.io/client-go/kubernetes/scheme"
34-
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
3537
"k8s.io/client-go/rest"
3638
"k8s.io/client-go/restmapper"
3739
dynclient "sigs.k8s.io/controller-runtime/pkg/client"

‎test/test-framework/cmd/manager/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import (
2121
"os"
2222
"runtime"
2323

24+
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
25+
_ "k8s.io/client-go/plugin/pkg/client/auth"
26+
2427
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
2528
"github.com/operator-framework/operator-sdk/pkg/leader"
2629
"github.com/operator-framework/operator-sdk/pkg/log/zap"
@@ -29,7 +32,6 @@ import (
2932
"github.com/operator-framework/operator-sdk/test/test-framework/pkg/controller"
3033
sdkVersion "github.com/operator-framework/operator-sdk/version"
3134
"github.com/spf13/pflag"
32-
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
3335
"sigs.k8s.io/controller-runtime/pkg/client/config"
3436
"sigs.k8s.io/controller-runtime/pkg/manager"
3537
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"

0 commit comments

Comments
 (0)