-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a partial cherry-pick of commit ae4f499, including changes around `kube`. This to include some of the changes around the construction of the ConfigFlags RESTClientGetter, as an attempt to solve token refresh issues. Signed-off-by: Hidde Beydals <hello@hidde.co>
- Loading branch information
Showing
11 changed files
with
750 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| Copyright 2022 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package kube | ||
|
|
||
| import ( | ||
| "k8s.io/cli-runtime/pkg/genericclioptions" | ||
| "k8s.io/client-go/rest" | ||
|
|
||
| "github.com/fluxcd/pkg/runtime/client" | ||
| ) | ||
|
|
||
| const ( | ||
| // DefaultKubeConfigSecretKey is the default data key ConfigFromSecret | ||
| // looks at when no data key is provided. | ||
| DefaultKubeConfigSecretKey = "value" | ||
| // DefaultKubeConfigSecretKeyExt is the default data key ConfigFromSecret | ||
| // looks at when no data key is provided, and DefaultKubeConfigSecretKey | ||
| // does not exist. | ||
| DefaultKubeConfigSecretKeyExt = DefaultKubeConfigSecretKey + ".yaml" | ||
| ) | ||
|
|
||
| // clientGetterOptions used to BuildClientGetter. | ||
| type clientGetterOptions struct { | ||
| config *rest.Config | ||
| namespace string | ||
| kubeConfig []byte | ||
| burst int | ||
| qps float32 | ||
| impersonateAccount string | ||
| kubeConfigOptions client.KubeConfigOptions | ||
| } | ||
|
|
||
| // ClientGetterOption configures a genericclioptions.RESTClientGetter. | ||
| type ClientGetterOption func(o *clientGetterOptions) | ||
|
|
||
| // WithKubeConfig creates a MemoryRESTClientGetter configured with the provided | ||
| // KubeConfig and other values. | ||
| func WithKubeConfig(kubeConfig []byte, qps float32, burst int, opts client.KubeConfigOptions) func(o *clientGetterOptions) { | ||
| return func(o *clientGetterOptions) { | ||
| o.kubeConfig = kubeConfig | ||
| o.qps = qps | ||
| o.burst = burst | ||
| o.kubeConfigOptions = opts | ||
| } | ||
| } | ||
|
|
||
| // WithImpersonate configures the genericclioptions.RESTClientGetter to | ||
| // impersonate the provided account name. | ||
| func WithImpersonate(accountName string) func(o *clientGetterOptions) { | ||
| return func(o *clientGetterOptions) { | ||
| o.impersonateAccount = accountName | ||
| } | ||
| } | ||
|
|
||
| // BuildClientGetter builds a genericclioptions.RESTClientGetter based on the | ||
| // provided options and returns the result. config and namespace are mandatory, | ||
| // and not expected to be nil or empty. | ||
| func BuildClientGetter(config *rest.Config, namespace string, opts ...ClientGetterOption) genericclioptions.RESTClientGetter { | ||
| o := &clientGetterOptions{ | ||
| config: config, | ||
| namespace: namespace, | ||
| } | ||
| for _, opt := range opts { | ||
| opt(o) | ||
| } | ||
| if len(o.kubeConfig) > 0 { | ||
| return NewMemoryRESTClientGetter(o.kubeConfig, namespace, o.impersonateAccount, o.qps, o.burst, o.kubeConfigOptions) | ||
| } | ||
| cfg := *config | ||
| SetImpersonationConfig(&cfg, namespace, o.impersonateAccount) | ||
| return NewInClusterRESTClientGetter(&cfg, namespace) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| Copyright 2022 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package kube | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/fluxcd/pkg/runtime/client" | ||
| . "github.com/onsi/gomega" | ||
| "k8s.io/cli-runtime/pkg/genericclioptions" | ||
| "k8s.io/client-go/rest" | ||
| ) | ||
|
|
||
| func TestBuildClientGetter(t *testing.T) { | ||
| t.Run("with config and namespace", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| cfg := &rest.Config{ | ||
| BearerToken: "a-token", | ||
| } | ||
| namespace := "a-namespace" | ||
| getter := BuildClientGetter(cfg, namespace) | ||
| g.Expect(getter).To(BeAssignableToTypeOf(&genericclioptions.ConfigFlags{})) | ||
|
|
||
| flags := getter.(*genericclioptions.ConfigFlags) | ||
| g.Expect(flags.BearerToken).ToNot(BeNil()) | ||
| g.Expect(*flags.BearerToken).To(Equal(cfg.BearerToken)) | ||
| g.Expect(flags.Namespace).ToNot(BeNil()) | ||
| g.Expect(*flags.Namespace).To(Equal(namespace)) | ||
| }) | ||
|
|
||
| t.Run("with kubeconfig and impersonate", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| namespace := "a-namespace" | ||
| cfg := []byte(`apiVersion: v1 | ||
| clusters: | ||
| - cluster: | ||
| server: https://example.com | ||
| name: example-cluster | ||
| contexts: | ||
| - context: | ||
| cluster: example-cluster | ||
| namespace: flux-system | ||
| kind: Config | ||
| preferences: {} | ||
| users:`) | ||
| qps := float32(600) | ||
| burst := 1000 | ||
| cfgOpts := client.KubeConfigOptions{InsecureTLS: true} | ||
|
|
||
| impersonate := "jane" | ||
|
|
||
| getter := BuildClientGetter(&rest.Config{}, namespace, WithKubeConfig(cfg, qps, burst, cfgOpts), WithImpersonate(impersonate)) | ||
| g.Expect(getter).To(BeAssignableToTypeOf(&MemoryRESTClientGetter{})) | ||
|
|
||
| got := getter.(*MemoryRESTClientGetter) | ||
| g.Expect(got.namespace).To(Equal(namespace)) | ||
| g.Expect(got.kubeConfig).To(Equal(cfg)) | ||
| g.Expect(got.qps).To(Equal(qps)) | ||
| g.Expect(got.burst).To(Equal(burst)) | ||
| g.Expect(got.kubeConfigOpts).To(Equal(cfgOpts)) | ||
| g.Expect(got.impersonateAccount).To(Equal(impersonate)) | ||
| }) | ||
|
|
||
| t.Run("with config and impersonate account", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| namespace := "a-namespace" | ||
| impersonate := "frank" | ||
| getter := BuildClientGetter(&rest.Config{}, namespace, WithImpersonate(impersonate)) | ||
| g.Expect(getter).To(BeAssignableToTypeOf(&genericclioptions.ConfigFlags{})) | ||
|
|
||
| flags := getter.(*genericclioptions.ConfigFlags) | ||
| g.Expect(flags.Namespace).ToNot(BeNil()) | ||
| g.Expect(*flags.Namespace).To(Equal(namespace)) | ||
| g.Expect(flags.Impersonate).ToNot(BeNil()) | ||
| g.Expect(*flags.Impersonate).To(Equal("system:serviceaccount:a-namespace:frank")) | ||
| }) | ||
|
|
||
| t.Run("with config and DefaultServiceAccount", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| namespace := "a-namespace" | ||
| DefaultServiceAccountName = "frank" | ||
| getter := BuildClientGetter(&rest.Config{}, namespace) | ||
| g.Expect(getter).To(BeAssignableToTypeOf(&genericclioptions.ConfigFlags{})) | ||
|
|
||
| flags := getter.(*genericclioptions.ConfigFlags) | ||
| g.Expect(flags.Namespace).ToNot(BeNil()) | ||
| g.Expect(*flags.Namespace).To(Equal(namespace)) | ||
| g.Expect(flags.Impersonate).ToNot(BeNil()) | ||
| g.Expect(*flags.Impersonate).To(Equal("system:serviceaccount:a-namespace:frank")) | ||
| }) | ||
| } |
Oops, something went wrong.