-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Federation] Convert the deployment controller to a sync controller. #46260
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| /* | ||
| Copyright 2017 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 federatedtypes | ||
|
|
||
| import ( | ||
| apiv1 "k8s.io/api/core/v1" | ||
| extensionsv1 "k8s.io/api/extensions/v1beta1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| pkgruntime "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/apimachinery/pkg/watch" | ||
| federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" | ||
| fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" | ||
| kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" | ||
| ) | ||
|
|
||
| const ( | ||
| DeploymentKind = "deployment" | ||
| DeploymentControllerName = "deployments" | ||
| FedDeploymentPreferencesAnnotation = "federation.kubernetes.io/deployment-preferences" | ||
| ) | ||
|
|
||
| func init() { | ||
| RegisterFederatedType(DeploymentKind, DeploymentControllerName, []schema.GroupVersionResource{extensionsv1.SchemeGroupVersion.WithResource(DeploymentControllerName)}, NewDeploymentAdapter) | ||
| } | ||
|
|
||
| type DeploymentAdapter struct { | ||
| *schedulingAdapter | ||
| client federationclientset.Interface | ||
| } | ||
|
|
||
| func NewDeploymentAdapter(client federationclientset.Interface) FederatedTypeAdapter { | ||
| schedulingAdapter := schedulingAdapter{ | ||
| preferencesAnnotationName: FedDeploymentPreferencesAnnotation, | ||
| updateStatusFunc: func(obj pkgruntime.Object, status SchedulingStatus) error { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| if status.Replicas != deployment.Status.Replicas || status.UpdatedReplicas != deployment.Status.UpdatedReplicas || | ||
| status.ReadyReplicas != deployment.Status.ReadyReplicas || status.AvailableReplicas != deployment.Status.AvailableReplicas { | ||
| deployment.Status = extensionsv1.DeploymentStatus{ | ||
| Replicas: status.Replicas, | ||
| UpdatedReplicas: status.UpdatedReplicas, | ||
| ReadyReplicas: status.ReadyReplicas, | ||
| AvailableReplicas: status.AvailableReplicas, | ||
| } | ||
| _, err := client.Extensions().Deployments(deployment.Namespace).UpdateStatus(deployment) | ||
| return err | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| return &DeploymentAdapter{&schedulingAdapter, client} | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) Kind() string { | ||
| return DeploymentKind | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ObjectType() pkgruntime.Object { | ||
| return &extensionsv1.Deployment{} | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) IsExpectedType(obj interface{}) bool { | ||
| _, ok := obj.(*extensionsv1.Deployment) | ||
| return ok | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) Copy(obj pkgruntime.Object) pkgruntime.Object { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| return fedutil.DeepCopyDeployment(deployment) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) Equivalent(obj1, obj2 pkgruntime.Object) bool { | ||
| deployment1 := obj1.(*extensionsv1.Deployment) | ||
| deployment2 := obj2.(*extensionsv1.Deployment) | ||
| return fedutil.DeploymentEquivalent(deployment1, deployment2) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) NamespacedName(obj pkgruntime.Object) types.NamespacedName { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| return types.NamespacedName{Namespace: deployment.Namespace, Name: deployment.Name} | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ObjectMeta(obj pkgruntime.Object) *metav1.ObjectMeta { | ||
| return &obj.(*extensionsv1.Deployment).ObjectMeta | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) FedCreate(obj pkgruntime.Object) (pkgruntime.Object, error) { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| return a.client.Extensions().Deployments(deployment.Namespace).Create(deployment) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) FedDelete(namespacedName types.NamespacedName, options *metav1.DeleteOptions) error { | ||
| return a.client.Extensions().Deployments(namespacedName.Namespace).Delete(namespacedName.Name, options) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) FedGet(namespacedName types.NamespacedName) (pkgruntime.Object, error) { | ||
| return a.client.Extensions().Deployments(namespacedName.Namespace).Get(namespacedName.Name, metav1.GetOptions{}) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) FedList(namespace string, options metav1.ListOptions) (pkgruntime.Object, error) { | ||
| return a.client.Extensions().Deployments(namespace).List(options) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) FedUpdate(obj pkgruntime.Object) (pkgruntime.Object, error) { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| return a.client.Extensions().Deployments(deployment.Namespace).Update(deployment) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) FedWatch(namespace string, options metav1.ListOptions) (watch.Interface, error) { | ||
| return a.client.Extensions().Deployments(namespace).Watch(options) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ClusterCreate(client kubeclientset.Interface, obj pkgruntime.Object) (pkgruntime.Object, error) { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| return client.Extensions().Deployments(deployment.Namespace).Create(deployment) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ClusterDelete(client kubeclientset.Interface, nsName types.NamespacedName, options *metav1.DeleteOptions) error { | ||
| return client.Extensions().Deployments(nsName.Namespace).Delete(nsName.Name, options) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ClusterGet(client kubeclientset.Interface, namespacedName types.NamespacedName) (pkgruntime.Object, error) { | ||
| return client.Extensions().Deployments(namespacedName.Namespace).Get(namespacedName.Name, metav1.GetOptions{}) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ClusterList(client kubeclientset.Interface, namespace string, options metav1.ListOptions) (pkgruntime.Object, error) { | ||
| return client.Extensions().Deployments(namespace).List(options) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ClusterUpdate(client kubeclientset.Interface, obj pkgruntime.Object) (pkgruntime.Object, error) { | ||
| deployment := obj.(*extensionsv1.Deployment) | ||
| return client.Extensions().Deployments(deployment.Namespace).Update(deployment) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) ClusterWatch(client kubeclientset.Interface, namespace string, options metav1.ListOptions) (watch.Interface, error) { | ||
| return client.Extensions().Deployments(namespace).Watch(options) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) EquivalentIgnoringSchedule(obj1, obj2 pkgruntime.Object) bool { | ||
| deployment1 := obj1.(*extensionsv1.Deployment) | ||
| deployment2 := a.Copy(obj2).(*extensionsv1.Deployment) | ||
| deployment2.Spec.Replicas = deployment1.Spec.Replicas | ||
| return fedutil.DeploymentEquivalent(deployment1, deployment2) | ||
| } | ||
|
|
||
| func (a *DeploymentAdapter) NewTestObject(namespace string) pkgruntime.Object { | ||
| replicas := int32(3) | ||
| zero := int64(0) | ||
| return &extensionsv1.Deployment{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| GenerateName: "test-deployment-", | ||
| Namespace: namespace, | ||
| }, | ||
| Spec: extensionsv1.DeploymentSpec{ | ||
| Replicas: &replicas, | ||
| Template: apiv1.PodTemplateSpec{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Labels: map[string]string{"foo": "bar"}, | ||
| }, | ||
| Spec: apiv1.PodSpec{ | ||
| TerminationGracePeriodSeconds: &zero, | ||
| Containers: []apiv1.Container{ | ||
| { | ||
| Name: "nginx", | ||
| Image: "nginx", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } |
Oops, something went wrong.
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.
Is
s.ConcurrentReplicaSetSyncsno longer relevant?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 is no longer relevant: it could be reintroduced in a future PR, but I haven't seen any evidence that it's useful.
Removing it as a flag could be interesting, since it's a breaking change to remove it. It's probably not a huge deal, since I don't think most people are running the controller manager themselves, but it's something we do need to think about. It's functionally harmless to leave it, though it's misleading.