kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12297 from rifelpet/revert-gossip-issuer 

Use MasterInternalName for gossip cluster SA issuer
This commit is contained in:
Kubernetes Prow Robot 2021-09-10 23:06:06 -07:00 committed by GitHub
parent e0b5cd3985 0d13da839a
commit b1fb6d1a92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/model/components/BUILD.bazel generated
View File

@ -32,7 +32,6 @@ go_library(
"//pkg/apis/kops:go_default_library", "//pkg/apis/kops:go_default_library",
"//pkg/apis/kops/util:go_default_library", "//pkg/apis/kops/util:go_default_library",
"//pkg/assets:go_default_library", "//pkg/assets:go_default_library",
"//pkg/dns:go_default_library",
"//pkg/k8sversion:go_default_library", "//pkg/k8sversion:go_default_library",
"//pkg/wellknownports:go_default_library", "//pkg/wellknownports:go_default_library",
"//upup/pkg/fi:go_default_library", "//upup/pkg/fi:go_default_library",

5
pkg/model/components/discovery.go
View File

@ -21,7 +21,6 @@ import (
"strings" "strings"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/dns"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/loader" "k8s.io/kops/upup/pkg/fi/loader"
"k8s.io/kops/util/pkg/vfs" "k8s.io/kops/util/pkg/vfs"
@ -83,9 +82,7 @@ func (b *DiscoveryOptionsBuilder) BuildOptions(o interface{}) error {
return fmt.Errorf("locationStore=%q is of unexpected type %T", store, base) return fmt.Errorf("locationStore=%q is of unexpected type %T", store, base)
} }
} else { } else {
if dns.IsGossipHostname(clusterSpec.MasterInternalName) { if supportsPublicJWKS(clusterSpec) {
serviceAccountIssuer = "https://kubernetes.default"
} else if supportsPublicJWKS(clusterSpec) {
serviceAccountIssuer = "https://" + clusterSpec.MasterPublicName serviceAccountIssuer = "https://" + clusterSpec.MasterPublicName
} else { } else {
serviceAccountIssuer = "https://" + clusterSpec.MasterInternalName serviceAccountIssuer = "https://" + clusterSpec.MasterInternalName

6
tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
View File

@ -178,8 +178,8 @@ kubeAPIServer:
requestheaderUsernameHeaders: requestheaderUsernameHeaders:
- X-Remote-User - X-Remote-User
securePort: 443 securePort: 443
serviceAccountIssuer: https://kubernetes.default serviceAccountIssuer: https://api.internal.minimal.k8s.local
serviceAccountJWKSURI: https://kubernetes.default/openid/v1/jwks serviceAccountJWKSURI: https://api.internal.minimal.k8s.local/openid/v1/jwks
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
storageBackend: etcd3 storageBackend: etcd3
kubeControllerManager: kubeControllerManager:
@ -244,7 +244,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master InstanceGroupRole: Master
NodeupConfigHash: m2l73Z2ZTSfhaFMqWrGVDU1JFskZDHBE4kShP/WV0dw= NodeupConfigHash: E3XByTEqoq24u0RUuiwk1z9v1aOJSZG1QOl/WsD9Tdw=
__EOF_KUBE_ENV __EOF_KUBE_ENV

4
tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -88,8 +88,8 @@ spec:
requestheaderUsernameHeaders: requestheaderUsernameHeaders:
- X-Remote-User - X-Remote-User
securePort: 443 securePort: 443
serviceAccountIssuer: https://kubernetes.default serviceAccountIssuer: https://api.internal.minimal.k8s.local
serviceAccountJWKSURI: https://kubernetes.default/openid/v1/jwks serviceAccountJWKSURI: https://api.internal.minimal.k8s.local/openid/v1/jwks
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
storageBackend: etcd3 storageBackend: etcd3
kubeControllerManager: kubeControllerManager:

4
tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
View File

@ -38,8 +38,8 @@ APIServerConfig:
requestheaderUsernameHeaders: requestheaderUsernameHeaders:
- X-Remote-User - X-Remote-User
securePort: 443 securePort: 443
serviceAccountIssuer: https://kubernetes.default serviceAccountIssuer: https://api.internal.minimal.k8s.local
serviceAccountJWKSURI: https://kubernetes.default/openid/v1/jwks serviceAccountJWKSURI: https://api.internal.minimal.k8s.local/openid/v1/jwks
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
storageBackend: etcd3 storageBackend: etcd3
ServiceAccountPublicKeys: | ServiceAccountPublicKeys: |