This repository was archived by the owner on Jul 30, 2021. It is now read-only.
generated from kubernetes/kubernetes-template-project
-
Notifications
You must be signed in to change notification settings - Fork 65
Move control plane locker from CAPA #33
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,126 @@ | ||
/* | ||
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 controllers | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/go-logr/logr" | ||
apicorev1 "k8s.io/api/core/v1" | ||
apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
corev1 "k8s.io/client-go/kubernetes/typed/core/v1" | ||
clusterv2 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2" | ||
) | ||
|
||
// ControlPlaneInitLocker provides a locking mechanism for cluster initialization. | ||
type ControlPlaneInitLocker interface { | ||
// Acquire returns true if it acquires the lock for the cluster. | ||
Acquire(cluster *clusterv2.Cluster) bool | ||
} | ||
|
||
// controlPlaneInitLocker uses a ConfigMap to synchronize cluster initialization. | ||
type controlPlaneInitLocker struct { | ||
log logr.Logger | ||
configMapClient corev1.ConfigMapsGetter | ||
} | ||
|
||
var _ ControlPlaneInitLocker = &controlPlaneInitLocker{} | ||
|
||
func newControlPlaneInitLocker(log logr.Logger, configMapClient corev1.ConfigMapsGetter) *controlPlaneInitLocker { | ||
return &controlPlaneInitLocker{ | ||
log: log, | ||
configMapClient: configMapClient, | ||
} | ||
} | ||
|
||
func (l *controlPlaneInitLocker) Acquire(cluster *clusterv2.Cluster) bool { | ||
configMapName := fmt.Sprintf("%s-controlplane", cluster.UID) | ||
log := l.log.WithValues("namespace", cluster.Namespace, "cluster-name", cluster.Name, "configmap-name", configMapName) | ||
|
||
exists, err := l.configMapExists(cluster.Namespace, configMapName) | ||
if err != nil { | ||
log.Error(err, "Error checking for control plane configmap lock existence") | ||
return false | ||
} | ||
if exists { | ||
return false | ||
} | ||
|
||
controlPlaneConfigMap := &apicorev1.ConfigMap{ | ||
ObjectMeta: metav1.ObjectMeta{ | ||
Namespace: cluster.Namespace, | ||
Name: configMapName, | ||
OwnerReferences: []metav1.OwnerReference{ | ||
{ | ||
APIVersion: cluster.APIVersion, | ||
Kind: cluster.Kind, | ||
Name: cluster.Name, | ||
UID: cluster.UID, | ||
}, | ||
}, | ||
}, | ||
} | ||
|
||
log.Info("Attempting to create control plane configmap lock") | ||
_, err = l.configMapClient.ConfigMaps(cluster.Namespace).Create(controlPlaneConfigMap) | ||
if err != nil { | ||
if apierrors.IsAlreadyExists(err) { | ||
// Someone else beat us to it | ||
log.Info("Control plane configmap lock already exists") | ||
} else { | ||
log.Error(err, "Error creating control plane configmap lock") | ||
} | ||
|
||
// Unable to acquire | ||
return false | ||
} | ||
|
||
// Successfully acquired | ||
return true | ||
} | ||
|
||
func (l *controlPlaneInitLocker) Release(cluster *clusterv2.Cluster) bool { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. interesting, golint doesn't fail this, presumably because controlPlaneInitLocker is not exported. |
||
configMapName := fmt.Sprintf("%s-controlplane", cluster.UID) | ||
log := l.log.WithValues("namespace", cluster.Namespace, "cluster-name", cluster.Name, "configmap-name", configMapName) | ||
|
||
log.Info("Checking for existence of control plane configmap lock", "configmap-name", configMapName) | ||
_, err := l.configMapClient.ConfigMaps(cluster.Namespace).Get(configMapName, metav1.GetOptions{}) | ||
switch { | ||
case apierrors.IsNotFound(err): | ||
log.Info("Control plane configmap lock not found, it may have been released already", "configmap-name", configMapName) | ||
case err != nil: | ||
log.Error(err, "Error retrieving control plane configmap lock", "configmap-name", configMapName) | ||
return false | ||
default: | ||
if err := l.configMapClient.ConfigMaps(cluster.Namespace).Delete(configMapName, nil); err != nil { | ||
log.Error(err, "Error deleting control plane configmap lock", "configmap-name", configMapName) | ||
return false | ||
} | ||
} | ||
// Successfully released | ||
return true | ||
} | ||
|
||
func (l *controlPlaneInitLocker) configMapExists(namespace, name string) (bool, error) { | ||
_, err := l.configMapClient.ConfigMaps(namespace).Get(name, metav1.GetOptions{}) | ||
if apierrors.IsNotFound(err) { | ||
return false, nil | ||
} | ||
|
||
return err == nil, err | ||
} |
This file contains hidden or 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,204 @@ | ||
/* | ||
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 controllers | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/pkg/errors" | ||
v1 "k8s.io/api/core/v1" | ||
apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
"k8s.io/apimachinery/pkg/runtime/schema" | ||
"k8s.io/apimachinery/pkg/types" | ||
"k8s.io/apimachinery/pkg/watch" | ||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1" | ||
clusterv2 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2" | ||
"sigs.k8s.io/controller-runtime/pkg/runtime/log" | ||
) | ||
|
||
func TestControlPlaneInitLockerAcquire(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
configMap *v1.ConfigMap | ||
getError error | ||
createError error | ||
expectAcquire bool | ||
}{ | ||
{ | ||
name: "configmap already exists", | ||
configMap: &v1.ConfigMap{}, | ||
expectAcquire: false, | ||
}, | ||
{ | ||
name: "error getting configmap", | ||
getError: errors.New("get error"), | ||
expectAcquire: false, | ||
}, | ||
{ | ||
name: "create succeeds", | ||
getError: apierrors.NewNotFound(schema.GroupResource{Group: "", Resource: "configmaps"}, "uid1-configmap"), | ||
expectAcquire: true, | ||
}, | ||
{ | ||
name: "create fails", | ||
getError: apierrors.NewNotFound(schema.GroupResource{Group: "", Resource: "configmaps"}, "uid1-configmap"), | ||
createError: errors.New("create error"), | ||
expectAcquire: false, | ||
}, | ||
} | ||
|
||
for _, tc := range tests { | ||
t.Run(tc.name, func(t *testing.T) { | ||
l := &controlPlaneInitLocker{ | ||
log: log.ZapLogger(true), | ||
configMapClient: &configMapsGetter{ | ||
configMap: tc.configMap, | ||
getError: tc.getError, | ||
createError: tc.createError, | ||
}, | ||
} | ||
|
||
cluster := &clusterv2.Cluster{ | ||
ObjectMeta: metav1.ObjectMeta{ | ||
Namespace: "ns1", | ||
Name: "name1", | ||
UID: types.UID("uid1"), | ||
}, | ||
} | ||
|
||
acquired := l.Acquire(cluster) | ||
if tc.expectAcquire != acquired { | ||
t.Errorf("expected %t, got %t", tc.expectAcquire, acquired) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
func TestControlPlaneInitLockerRelease(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
configMap *v1.ConfigMap | ||
getError error | ||
deleteError error | ||
expectRelease bool | ||
}{ | ||
{ | ||
name: "error getting configmap", | ||
getError: errors.New("get error"), | ||
expectRelease: false, | ||
}, | ||
{ | ||
name: "configmap not found", | ||
getError: apierrors.NewNotFound(schema.GroupResource{Group: "", Resource: "configmaps"}, "uid1-configmap"), | ||
expectRelease: true, | ||
}, | ||
{ | ||
name: "delete succeeds", | ||
expectRelease: true, | ||
}, | ||
{ | ||
name: "delete fails", | ||
deleteError: errors.New("delete error"), | ||
expectRelease: false, | ||
}, | ||
} | ||
|
||
for _, tc := range tests { | ||
t.Run(tc.name, func(t *testing.T) { | ||
l := &controlPlaneInitLocker{ | ||
log: log.ZapLogger(true), | ||
configMapClient: &configMapsGetter{ | ||
configMap: tc.configMap, | ||
getError: tc.getError, | ||
deleteError: tc.deleteError, | ||
}, | ||
} | ||
|
||
cluster := &clusterv2.Cluster{ | ||
ObjectMeta: metav1.ObjectMeta{ | ||
Namespace: "ns1", | ||
Name: "name1", | ||
UID: types.UID("uid1"), | ||
}, | ||
} | ||
|
||
released := l.Release(cluster) | ||
if tc.expectRelease != released { | ||
t.Errorf("expected %t, got %t", tc.expectRelease, released) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
type configMapsGetter struct { | ||
configMap *v1.ConfigMap | ||
getError error | ||
createError error | ||
deleteError error | ||
} | ||
|
||
func (c *configMapsGetter) ConfigMaps(namespace string) corev1client.ConfigMapInterface { | ||
return &configMapClient{ | ||
configMap: c.configMap, | ||
getError: c.getError, | ||
createError: c.createError, | ||
deleteError: c.deleteError, | ||
} | ||
} | ||
|
||
type configMapClient struct { | ||
configMap *v1.ConfigMap | ||
getError error | ||
createError error | ||
deleteError error | ||
} | ||
|
||
func (c *configMapClient) Create(configMap *v1.ConfigMap) (*v1.ConfigMap, error) { | ||
return c.configMap, c.createError | ||
} | ||
|
||
func (c *configMapClient) Get(name string, getOptions metav1.GetOptions) (*v1.ConfigMap, error) { | ||
if c.getError != nil { | ||
return nil, c.getError | ||
} | ||
return c.configMap, nil | ||
} | ||
|
||
func (c *configMapClient) Update(*v1.ConfigMap) (*v1.ConfigMap, error) { | ||
panic("not implemented") | ||
} | ||
|
||
func (c *configMapClient) Delete(name string, options *metav1.DeleteOptions) error { | ||
return c.deleteError | ||
} | ||
|
||
func (c *configMapClient) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { | ||
panic("not implemented") | ||
} | ||
|
||
func (c *configMapClient) List(opts metav1.ListOptions) (*v1.ConfigMapList, error) { | ||
panic("not implemented") | ||
} | ||
|
||
func (c *configMapClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { | ||
panic("not implemented") | ||
} | ||
|
||
func (c *configMapClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) { | ||
panic("not implemented") | ||
} |
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.
Might be I'm missing something, but I don't see the counterpart of Acquire (Release)
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.
In the original codebase, the release part was done in the Cluster Actuator https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/pkg/cloud/actuators/cluster/actuator.go#L140-L159, we should move this as well
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.
Reconcile
is not complete yet. I think we can add this later. Right?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.
@SataQiu given that the Release code pointed out by @vincepri is well-scoped, IMO it would be great to include it in this PR so the control plane locker is consistent.
wdyt?
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.
I'll move it over when I need it in the actual usage of this code. no worries here.