-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
When the PublicJWKS feature-flag is set, we expose the apiserver JWKS document publicly (including enabling anonymous access). This is a stepping stone to a more hardened configuration where we copy the JWKS document to S3/GCS/etc.
- Loading branch information
Showing
39 changed files
with
2,356 additions
and
36 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
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,79 @@ | ||
| /* | ||
| Copyright 2019 The Kubernetes 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 awsmodel | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "k8s.io/kops/pkg/featureflag" | ||
| "k8s.io/kops/pkg/model" | ||
| "k8s.io/kops/pkg/model/iam" | ||
| "k8s.io/kops/upup/pkg/fi" | ||
| "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" | ||
| "k8s.io/kops/upup/pkg/fi/fitasks" | ||
| ) | ||
|
|
||
| // OIDCProviderBuilder configures IAM OIDC Provider | ||
| type OIDCProviderBuilder struct { | ||
| *model.KopsModelContext | ||
|
|
||
| KeyStore fi.CAStore | ||
| Lifecycle *fi.Lifecycle | ||
| } | ||
|
|
||
| var _ fi.ModelBuilder = &OIDCProviderBuilder{} | ||
|
|
||
| const ( | ||
| defaultAudience = "amazonaws.com" | ||
| ) | ||
|
|
||
| func (b *OIDCProviderBuilder) Build(c *fi.ModelBuilderContext) error { | ||
| var thumbprints []fi.Resource | ||
| var issuerURL string | ||
|
|
||
| if featureflag.PublicJWKS.Enabled() { | ||
| serviceAccountIssuer, err := iam.ServiceAccountIssuer(b.ClusterName(), &b.Cluster.Spec) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| issuerURL = serviceAccountIssuer | ||
|
|
||
| caTaskObject, found := c.Tasks["Keypair/ca"] | ||
| if !found { | ||
| return fmt.Errorf("keypair/ca task not found") | ||
| } | ||
|
|
||
| caTask := caTaskObject.(*fitasks.Keypair) | ||
| fingerprint := caTask.CertificateSHA1Fingerprint() | ||
|
|
||
| thumbprints = []fi.Resource{fingerprint} | ||
| } | ||
|
|
||
| if issuerURL == "" { | ||
| return nil | ||
| } | ||
|
|
||
| c.AddTask(&awstasks.IAMOIDCProvider{ | ||
| Name: fi.String(b.ClusterName()), | ||
| Lifecycle: b.Lifecycle, | ||
| URL: fi.String(issuerURL), | ||
| ClientIDs: []*string{fi.String(defaultAudience)}, | ||
| Thumbprints: thumbprints, | ||
| }) | ||
|
|
||
| return nil | ||
| } |
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,83 @@ | ||
| /* | ||
| Copyright 2019 The Kubernetes 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 components | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "k8s.io/kops/pkg/apis/kops" | ||
| "k8s.io/kops/pkg/featureflag" | ||
| "k8s.io/kops/pkg/model/iam" | ||
| "k8s.io/kops/upup/pkg/fi/loader" | ||
| ) | ||
|
|
||
| // DiscoveryOptionsBuilder adds options for identity discovery to the model (mostly kube-apiserver) | ||
| type DiscoveryOptionsBuilder struct { | ||
| *OptionsContext | ||
| } | ||
|
|
||
| var _ loader.OptionsBuilder = &DiscoveryOptionsBuilder{} | ||
|
|
||
| func (b *DiscoveryOptionsBuilder) BuildOptions(o interface{}) error { | ||
| clusterSpec := o.(*kops.ClusterSpec) | ||
|
|
||
| useJWKS := featureflag.PublicJWKS.Enabled() | ||
| if !useJWKS { | ||
| return nil | ||
| } | ||
|
|
||
| if clusterSpec.KubeAPIServer == nil { | ||
| clusterSpec.KubeAPIServer = &kops.KubeAPIServerConfig{} | ||
| } | ||
|
|
||
| kubeAPIServer := clusterSpec.KubeAPIServer | ||
|
|
||
| if kubeAPIServer.FeatureGates == nil { | ||
| kubeAPIServer.FeatureGates = make(map[string]string) | ||
| } | ||
| kubeAPIServer.FeatureGates["ServiceAccountIssuerDiscovery"] = "true" | ||
|
|
||
| if len(kubeAPIServer.APIAudiences) == 0 { | ||
| kubeAPIServer.APIAudiences = []string{"kubernetes.svc.default"} | ||
| } | ||
|
|
||
| if kubeAPIServer.ServiceAccountIssuer == nil { | ||
| serviceAccountIssuer, err := iam.ServiceAccountIssuer(b.ClusterName, clusterSpec) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| kubeAPIServer.ServiceAccountIssuer = &serviceAccountIssuer | ||
| } | ||
|
|
||
| if kubeAPIServer.ServiceAccountJWKSURI == nil { | ||
| jwksURL := *kubeAPIServer.ServiceAccountIssuer | ||
| jwksURL = strings.TrimSuffix(jwksURL, "/") + "/openid/v1/jwks" | ||
|
|
||
| kubeAPIServer.ServiceAccountJWKSURI = &jwksURL | ||
| } | ||
|
|
||
| if kubeAPIServer.ServiceAccountSigningKeyFile == nil { | ||
| s := "/srv/kubernetes/server.key" | ||
| kubeAPIServer.ServiceAccountSigningKeyFile = &s | ||
| } | ||
|
|
||
| if len(kubeAPIServer.ServiceAccountKeyFile) == 0 { | ||
| kubeAPIServer.ServiceAccountKeyFile = []string{"/srv/kubernetes/server.key"} | ||
| } | ||
|
|
||
| return nil | ||
| } |
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
Oops, something went wrong.