Step 2 – controlplane/apiserver: move peer proxy code to allow generic aggregator construction #124576
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,89 @@ | ||
| /* | ||
| Copyright 2024 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 apiserver | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apiserver/pkg/reconcilers" | ||
| genericapiserver "k8s.io/apiserver/pkg/server" | ||
| serverstorage "k8s.io/apiserver/pkg/server/storage" | ||
| "k8s.io/apiserver/pkg/storageversion" | ||
| utilpeerproxy "k8s.io/apiserver/pkg/util/peerproxy" | ||
| clientgoinformers "k8s.io/client-go/informers" | ||
| "k8s.io/client-go/transport" | ||
| "k8s.io/klog/v2" | ||
| api "k8s.io/kubernetes/pkg/apis/core" | ||
| ) | ||
|
|
||
| const ( | ||
| // DefaultPeerEndpointReconcileInterval is the default amount of time for how often | ||
| // the peer endpoint leases are reconciled. | ||
| DefaultPeerEndpointReconcileInterval = 10 * time.Second | ||
| // DefaultPeerEndpointReconcilerTTL is the default TTL timeout for peer endpoint | ||
| // leases on the storage layer | ||
| DefaultPeerEndpointReconcilerTTL = 15 * time.Second | ||
| ) | ||
|
|
||
| func BuildPeerProxy(versionedInformer clientgoinformers.SharedInformerFactory, svm storageversion.Manager, | ||
| proxyClientCertFile string, proxyClientKeyFile string, peerCAFile string, peerAdvertiseAddress reconcilers.PeerAdvertiseAddress, | ||
| apiServerID string, reconciler reconcilers.PeerEndpointLeaseReconciler, serializer runtime.NegotiatedSerializer) (utilpeerproxy.Interface, error) { | ||
| if proxyClientCertFile == "" { | ||
| return nil, fmt.Errorf("error building peer proxy handler, proxy-cert-file not specified") | ||
| } | ||
| if proxyClientKeyFile == "" { | ||
| return nil, fmt.Errorf("error building peer proxy handler, proxy-key-file not specified") | ||
| } | ||
| // create proxy client config | ||
| clientConfig := &transport.Config{ | ||
| TLS: transport.TLSConfig{ | ||
| Insecure: false, | ||
| CertFile: proxyClientCertFile, | ||
| KeyFile: proxyClientKeyFile, | ||
| CAFile: peerCAFile, | ||
| ServerName: "kubernetes.default.svc", | ||
|
There was a problem hiding this comment. should this leak into generic or be an option? There was a problem hiding this comment. An option in follow-up (step 3). |
||
| }} | ||
|
|
||
| // build proxy transport | ||
| proxyRoundTripper, transportBuildingError := transport.New(clientConfig) | ||
| if transportBuildingError != nil { | ||
| klog.Error(transportBuildingError.Error()) | ||
| return nil, transportBuildingError | ||
| } | ||
| return utilpeerproxy.NewPeerProxyHandler( | ||
| versionedInformer, | ||
| svm, | ||
| proxyRoundTripper, | ||
| apiServerID, | ||
| reconciler, | ||
| serializer, | ||
| ), nil | ||
| } | ||
|
|
||
| // CreatePeerEndpointLeaseReconciler creates a apiserver endpoint lease reconciliation loop | ||
| // The peer endpoint leases are used to find network locations of apiservers for peer proxy | ||
| func CreatePeerEndpointLeaseReconciler(c genericapiserver.Config, storageFactory serverstorage.StorageFactory) (reconcilers.PeerEndpointLeaseReconciler, error) { | ||
| ttl := DefaultPeerEndpointReconcilerTTL | ||
| config, err := storageFactory.NewConfig(api.Resource("apiServerPeerIPInfo")) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error creating storage factory config: %w", err) | ||
| } | ||
| reconciler, err := reconcilers.NewPeerEndpointLeaseReconciler(config, "/peerserverleases/", ttl) | ||
| return reconciler, err | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -54,7 +54,6 @@ import ( | |
| storageapiv1beta1 "k8s.io/api/storage/v1beta1" | ||
| svmv1alpha1 "k8s.io/api/storagemigration/v1alpha1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| utilnet "k8s.io/apimachinery/pkg/util/net" | ||
| "k8s.io/apimachinery/pkg/util/runtime" | ||
|
|
@@ -67,14 +66,10 @@ import ( | |
| genericapiserver "k8s.io/apiserver/pkg/server" | ||
| "k8s.io/apiserver/pkg/server/dynamiccertificates" | ||
| serverstorage "k8s.io/apiserver/pkg/server/storage" | ||
| utilfeature "k8s.io/apiserver/pkg/util/feature" | ||
| "k8s.io/client-go/kubernetes" | ||
| corev1client "k8s.io/client-go/kubernetes/typed/core/v1" | ||
| discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1" | ||
| "k8s.io/component-helpers/apimachinery/lease" | ||
| "k8s.io/klog/v2" | ||
| api "k8s.io/kubernetes/pkg/apis/core" | ||
|
|
@@ -157,16 +152,6 @@ type Extra struct { | |
| EndpointReconcilerConfig EndpointReconcilerConfig | ||
| KubeletClientConfig kubeletclient.KubeletClientConfig | ||
|
|
||
| // Values to build the IP addresses used by discovery | ||
| // The range of IPs to be assigned to services with type=ClusterIP or greater | ||
| ServiceIPRange net.IPNet | ||
|
|
@@ -290,6 +275,12 @@ func (c *Config) createEndpointReconciler() reconcilers.EndpointReconciler { | |
|
|
||
| // Complete fills in any fields not set that are required to have valid data. It's mutating the receiver. | ||
| func (c *Config) Complete() CompletedConfig { | ||
| if c.ControlPlane.PeerEndpointReconcileInterval == 0 && c.EndpointReconcilerConfig.Interval != 0 { | ||
| // default this to the endpoint reconciler value before the generic | ||
| // controlplane completion can kick in | ||
| c.ControlPlane.PeerEndpointReconcileInterval = c.EndpointReconcilerConfig.Interval | ||
| } | ||
|
|
||
| cfg := completedConfig{ | ||
| c.ControlPlane.Complete(), | ||
| &c.Extra, | ||
|
|
@@ -508,11 +499,11 @@ func (c CompletedConfig) New(delegationTarget genericapiserver.DelegationTarget) | |
| } | ||
|
|
||
| if utilfeature.DefaultFeatureGate.Enabled(features.UnknownVersionInteroperabilityProxy) { | ||
| peeraddress := getPeerAddress(c.ControlPlane.Extra.PeerAdvertiseAddress, c.ControlPlane.Generic.PublicAddress, publicServicePort) | ||
| peerEndpointCtrl := peerreconcilers.New( | ||
| c.ControlPlane.Generic.APIServerID, | ||
| peeraddress, | ||
| c.ControlPlane.Extra.PeerEndpointLeaseReconciler, | ||
| c.Extra.EndpointReconcilerConfig.Interval, | ||
| client) | ||
| if err != nil { | ||
|
|
@@ -529,9 +520,9 @@ func (c CompletedConfig) New(delegationTarget genericapiserver.DelegationTarget) | |
| return nil | ||
| }) | ||
| // Add PostStartHooks for Unknown Version Proxy filter. | ||
| if c.ControlPlane.Extra.PeerProxy != nil { | ||
| m.GenericAPIServer.AddPostStartHookOrDie("unknown-version-proxy-filter", func(context genericapiserver.PostStartHookContext) error { | ||
| err := c.ControlPlane.Extra.PeerProxy.WaitForCacheSync(context.StopCh) | ||
| return err | ||
| }) | ||
| } | ||
|
|
@@ -579,7 +570,7 @@ func (c CompletedConfig) New(delegationTarget genericapiserver.DelegationTarget) | |
| leaseName := m.GenericAPIServer.APIServerID | ||
| holderIdentity := m.GenericAPIServer.APIServerID + "_" + string(uuid.NewUUID()) | ||
|
|
||
| peeraddress := getPeerAddress(c.ControlPlane.Extra.PeerAdvertiseAddress, c.ControlPlane.Generic.PublicAddress, publicServicePort) | ||
| // must replace ':,[]' in [ip:port] to be able to store this as a valid label value | ||
| controller := lease.NewController( | ||
| clock.RealClock{}, | ||
|
|
@@ -782,53 +773,6 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig { | |
| return ret | ||
| } | ||
|
|
||
| // utility function to get the apiserver address that is used by peer apiservers to proxy | ||
| // requests to this apiserver in case the peer is incapable of serving the request | ||
| func getPeerAddress(peerAdvertiseAddress peerreconcilers.PeerAdvertiseAddress, publicAddress net.IP, publicServicePort int) string { | ||
|
There was a problem hiding this comment. is this kubeapi-specific code or not? There was a problem hiding this comment. Generic. It will be moved in #120202. |
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
where is this used, if anywhere? it seems net new?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's defaulted in the generic code, and overridden with the service endpoint reconciler interval (= old behaviour) for kube-apiserver.