Skip to content
GitLab
Unverified Commit 4f52b4a2 authored by Lucas Käldström's avatar Lucas Käldström Committed by GitHub
Browse files

Merge pull request #289 from weaveworks/use-client 

Use runtime-controller client interface
parents 38998f65 e5ab4f8b
master WKP-1012/update-weave-net-master WKP-1116-kubectl-to-apiserver WKP-1487/kubeconfig-default-dir-2 add_tag_sign_comment bump_capei_dep2 bump_capei_dep2_2 bump_capei_dep3 bump_capei_dep4 bump_capei_dep5 debug_ssh_key_error dinamic_latest_capei_release disable-hostpid fix-upgrade-centos-circleci justin/kubernetes1.20 luxas-patch-1 make-wksctl-work-against-new-existinginfra move-manifest plan-context release-0.9 remove-mem-limits remove-test-yaml test-image-update test-updated-capei test_both_centos_and_ubuntu_nodes tracing try-profiles turn-controller-into-provider update-examples-v1alpha3 update-gce-example-machines.yaml-generation upgrade-flux-1-21 use-capei-at-increase-wks-controller-mem-limit v0.10.2 v0.10.1 v0.10.0 v0.9.0-rc.3 v0.9.0-rc.2 v0.9.0-rc.1 v0.9.0-beta.1 v0.9.0-alpha.4 v0.9.0-alpha.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 38 deletions
+42 -38
pkg/apis/wksprovider/controller/wksctl/machine_controller.go
+ 42
- 38
View file @ 4f52b4a2
......@@ -25,9 +25,7 @@ import (
bootstraputils "github.com/weaveworks/wksctl/pkg/utilities/kubeadm"
"github.com/weaveworks/wksctl/pkg/utilities/version"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
......@@ -203,7 +201,8 @@ func (a *MachineController) connectTo(ctx context.Context, c *existinginfrav1.Ex
}
func (a *MachineController) sshKey(ctx context.Context) ([]byte, error) {
secret, err := a.clientSet.CoreV1().Secrets(a.controllerNamespace).Get(ctx, controllerSecret, metav1.GetOptions{})
var secret corev1.Secret
err := a.client.Get(ctx, client.ObjectKey{Namespace: a.controllerNamespace, Name: controllerSecret}, &secret)
if err != nil {
return nil, gerrors.Wrap(err, "failed to get WKS' secret")
}
......@@ -225,7 +224,8 @@ type kubeadmJoinSecrets struct {
}
func (a *MachineController) kubeadmJoinSecrets(ctx context.Context) (*kubeadmJoinSecrets, error) {
secret, err := a.clientSet.CoreV1().Secrets(a.controllerNamespace).Get(ctx, controllerSecret, metav1.GetOptions{})
var secret corev1.Secret
err := a.client.Get(ctx, client.ObjectKey{Namespace: a.controllerNamespace, Name: controllerSecret}, &secret)
if err != nil {
return nil, gerrors.Wrap(err, "failed to get WKS' secret")
}
......@@ -236,12 +236,12 @@ func (a *MachineController) kubeadmJoinSecrets(ctx context.Context) (*kubeadmJoi
}, nil
}
func (a *MachineController) updateKubeadmJoinSecrets(ctx context.Context, ID string) error {
func (a *MachineController) updateKubeadmJoinSecrets(ctx context.Context, ID string, secret *corev1.Secret) error {
len := base64.StdEncoding.EncodedLen(len(ID))
enc := make([]byte, len)
base64.StdEncoding.Encode(enc, []byte(ID))
patch := []byte(fmt.Sprintf("{\"data\":{\"%s\":\"%s\"}}", bootstrapTokenID, enc))
_, err := a.clientSet.CoreV1().Secrets(a.controllerNamespace).Patch(ctx, controllerSecret, types.StrategicMergePatchType, patch, metav1.PatchOptions{})
err := a.client.Patch(ctx, secret, client.RawPatch(types.StrategicMergePatchType, patch))
if err != nil {
log.Debugf("failed to patch wks secret %s %v", patch, err)
}
......@@ -251,7 +251,8 @@ func (a *MachineController) updateKubeadmJoinSecrets(ctx context.Context, ID str
func (a *MachineController) token(ctx context.Context, ID string) (string, error) {
ns := "kube-system"
name := fmt.Sprintf("%s%s", bootstrapapi.BootstrapTokenSecretPrefix, ID)
secret, err := a.clientSet.CoreV1().Secrets(ns).Get(ctx, name, metav1.GetOptions{})
secret := &corev1.Secret{}
err := a.client.Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, secret)
if err != nil {
// The secret may have been removed if it expired so we will generate a new one
log.Debugf("failed to find original bootstrap token %s/%s, generating a new one", ns, name)
......@@ -300,18 +301,18 @@ func (a *MachineController) installNewBootstrapToken(ctx context.Context, ns str
if err != nil {
return nil, gerrors.Errorf("failed to create new bootstrap token %s/%s", ns, secret.ObjectMeta.Name)
}
s, err := a.clientSet.CoreV1().Secrets(ns).Create(ctx, secret, metav1.CreateOptions{})
err = a.client.Create(ctx, secret)
if err != nil {
return nil, gerrors.Errorf("failed to install new bootstrap token %s/%s", ns, secret.ObjectMeta.Name)
}
tokenID, ok := s.Data[bootstrapapi.BootstrapTokenIDKey]
tokenID, ok := secret.Data[bootstrapapi.BootstrapTokenIDKey]
if !ok {
return nil, gerrors.Errorf("token-id not found %s/%s", s.ObjectMeta.Namespace, s.ObjectMeta.Name)
return nil, gerrors.Errorf("token-id not found %s/%s", secret.ObjectMeta.Namespace, secret.ObjectMeta.Name)
}
if err := a.updateKubeadmJoinSecrets(ctx, string(tokenID)); err != nil {
return nil, gerrors.Errorf("Failed to update wks join token %s/%s", s.ObjectMeta.Namespace, s.ObjectMeta.Name)
if err := a.updateKubeadmJoinSecrets(ctx, string(tokenID), secret); err != nil {
return nil, gerrors.Errorf("Failed to update wks join token %s/%s", secret.ObjectMeta.Namespace, secret.ObjectMeta.Name)
}
return s, nil
return secret, nil
}
// Delete the machine. If no error is returned, it is assumed that all dependent resources have been cleaned up.
......@@ -348,7 +349,7 @@ func (a *MachineController) delete(ctx context.Context, c *existinginfrav1.Exist
}); err != nil {
return err
}
if err = a.clientSet.CoreV1().Nodes().Delete(ctx, node.Name, metav1.DeleteOptions{}); err != nil {
if err := a.client.Delete(ctx, node); err != nil {
return err
}
a.recordEvent(machine, corev1.EventTypeNormal, "Delete", "deleted machine %s", machine.Name)
......@@ -517,7 +518,7 @@ func (a *MachineController) kubeadmUpOrDowngrade(ctx context.Context, machine *c
return nil
}
func (a *MachineController) prepareForMasterUpdate(ctx context.Context, node *v1.Node) error {
func (a *MachineController) prepareForMasterUpdate(ctx context.Context, node *corev1.Node) error {
// Check if it's safe to update a master
if err := a.checkMasterHAConstraint(ctx, node); err != nil {
return gerrors.Wrap(err, "Not enough available master nodes to allow master update")
......@@ -608,9 +609,9 @@ func (a *MachineController) getNodePlan(ctx context.Context, provider *existingi
return plan, nil
}
func (a *MachineController) getAuthConfigMap(ctx context.Context) (*v1.ConfigMap, error) {
client := a.clientSet.CoreV1().ConfigMaps(a.controllerNamespace)
maps, err := client.List(ctx, metav1.ListOptions{})
func (a *MachineController) getAuthConfigMap(ctx context.Context) (*corev1.ConfigMap, error) {
var maps corev1.ConfigMapList
err := a.client.List(ctx, &maps, &client.ListOptions{Namespace: a.controllerNamespace})
if err != nil {
return nil, err
}
......@@ -622,12 +623,12 @@ func (a *MachineController) getAuthConfigMap(ctx context.Context) (*v1.ConfigMap
return nil, nil
}
func (a *MachineController) getAuthSecrets(ctx context.Context, authConfigMap *v1.ConfigMap) (map[string]resource.SecretData, error) {
func (a *MachineController) getAuthSecrets(ctx context.Context, authConfigMap *corev1.ConfigMap) (map[string]resource.SecretData, error) {
authSecrets := map[string]resource.SecretData{}
for _, authType := range []string{"authentication", "authorization"} {
secretName := authConfigMap.Data[authType+"-secret-name"]
client := a.clientSet.CoreV1().Secrets(a.controllerNamespace)
secret, err := client.Get(ctx, secretName, metav1.GetOptions{})
var secret corev1.Secret
err := a.client.Get(ctx, client.ObjectKey{Namespace: a.controllerNamespace, Name: secretName}, &secret)
// TODO: retry several times like the old code did (?)
// TODO: check whether it is a not-found response
if err != nil {
......@@ -641,18 +642,18 @@ func (a *MachineController) getAuthSecrets(ctx context.Context, authConfigMap *v
return authSecrets, nil
}
func (a *MachineController) getProviderConfigMaps(ctx context.Context, provider *existinginfrav1.ExistingInfraCluster) (map[string]*v1.ConfigMap, error) {
func (a *MachineController) getProviderConfigMaps(ctx context.Context, provider *existinginfrav1.ExistingInfraCluster) (map[string]*corev1.ConfigMap, error) {
fileSpecs := provider.Spec.OS.Files
client := a.clientSet.CoreV1().ConfigMaps(a.controllerNamespace)
configMaps := map[string]*v1.ConfigMap{}
configMaps := map[string]*corev1.ConfigMap{}
for _, fileSpec := range fileSpecs {
mapName := fileSpec.Source.ConfigMap
if _, seen := configMaps[mapName]; !seen {
configMap, err := client.Get(ctx, mapName, metav1.GetOptions{})
var configMap corev1.ConfigMap
err := a.client.Get(ctx, client.ObjectKey{Namespace: a.controllerNamespace, Name: mapName}, &configMap)
if err != nil {
return nil, err
}
configMaps[mapName] = configMap
configMaps[mapName] = &configMap
}
}
return configMaps, nil
......@@ -754,15 +755,15 @@ func nodeVersion(node *corev1.Node) string {
func (a *MachineController) uncordon(ctx context.Context, node *corev1.Node) error {
contextLog := log.WithFields(log.Fields{"node": node.Name})
client := a.clientSet.CoreV1().Nodes()
retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
result, getErr := client.Get(ctx, node.Name, metav1.GetOptions{})
var result corev1.Node
getErr := a.client.Get(ctx, client.ObjectKey{Name: node.Name}, &result)
if getErr != nil {
contextLog.Errorf("failed to read node info, can't reschedule: %v", getErr)
return getErr
}
result.Spec.Unschedulable = false
_, updateErr := client.Update(ctx, result, metav1.UpdateOptions{})
updateErr := a.client.Update(ctx, &result)
if updateErr != nil {
contextLog.Errorf("failed to reschedule node: %v", updateErr)
return updateErr
......@@ -820,15 +821,15 @@ func (a *MachineController) removeNodeLabel(ctx context.Context, node *corev1.No
func (a *MachineController) modifyNode(ctx context.Context, node *corev1.Node, updater func(node *corev1.Node)) error {
contextLog := log.WithFields(log.Fields{"node": node.Name})
client := a.clientSet.CoreV1().Nodes()
retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
result, getErr := client.Get(ctx, node.Name, metav1.GetOptions{})
var result corev1.Node
getErr := a.client.Get(ctx, client.ObjectKey{Name: node.Name}, &result)
if getErr != nil {
contextLog.Errorf("failed to read node info, assuming unsafe to update: %v", getErr)
return getErr
}
updater(result)
_, updateErr := client.Update(ctx, result, metav1.UpdateOptions{})
updater(&result)
updateErr := a.client.Update(ctx, &result)
if updateErr != nil {
contextLog.Errorf("failed attempt to update node annotation: %v", updateErr)
return updateErr
......@@ -842,7 +843,7 @@ func (a *MachineController) modifyNode(ctx context.Context, node *corev1.Node, u
return nil
}
func (a *MachineController) checkMasterHAConstraint(ctx context.Context, nodeBeingUpdated *v1.Node) error {
func (a *MachineController) checkMasterHAConstraint(ctx context.Context, nodeBeingUpdated *corev1.Node) error {
nodes, err := a.getMasterNodes(ctx)
if err != nil {
// If we can't read the nodes, return the error so we don't
......@@ -867,7 +868,7 @@ func (a *MachineController) checkMasterHAConstraint(ctx context.Context, nodeBei
// we compare Nodes by name, because name is required to be unique and
// uids will differ if we manage to delete and recreate the object.
func sameNode(a, b *v1.Node) bool {
func sameNode(a, b *corev1.Node) bool {
return a.Name == b.Name
}
......@@ -881,7 +882,8 @@ func hasConditionTrue(node *corev1.Node, typ corev1.NodeConditionType) bool {
}
func (a *MachineController) findNodeByID(ctx context.Context, machineID, systemUUID string) (*corev1.Node, error) {
nodes, err := a.clientSet.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
var nodes corev1.NodeList
err := a.client.List(ctx, &nodes)
if err != nil {
return nil, gerrors.Wrap(err, "failed to list nodes")
}
......@@ -913,7 +915,8 @@ func (a *MachineController) getMasterNode(ctx context.Context) (*corev1.Node, er
}
func (a *MachineController) getMasterNodes(ctx context.Context) ([]*corev1.Node, error) {
nodes, err := a.clientSet.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
var nodes corev1.NodeList
err := a.client.List(ctx, &nodes)
if err != nil {
return nil, gerrors.Wrap(err, "failed to list nodes")
}
......@@ -953,7 +956,8 @@ func (a *MachineController) isControllerNode(ctx context.Context, node *corev1.N
}
func (a *MachineController) getControllerNodeName(ctx context.Context) (string, error) {
pods, err := a.clientSet.CoreV1().Pods(a.controllerNamespace).List(ctx, metav1.ListOptions{})
var pods corev1.PodList
err := a.client.List(ctx, &pods, &client.ListOptions{Namespace: a.controllerNamespace})
if err != nil {
return "", err
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全