mirror of
https://github.com/clastix/kamaji.git
synced 2026-02-14 18:10:03 +00:00
* refactor: migrate error packages from pkg/errors to stdlib Replace github.com/pkg/errors with Go standard library error handling in foundation error packages: - internal/datastore/errors: errors.Wrap -> fmt.Errorf with %w - internal/errors: errors.As -> stdlib errors.As - controllers/soot/controllers/errors: errors.New -> stdlib errors.New Part 1 of 4 in the pkg/errors migration. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: migrate datastore package from pkg/errors to stdlib Replace github.com/pkg/errors with Go standard library error handling in the datastore layer: - connection.go: errors.Wrap -> fmt.Errorf with %w - datastore.go: errors.Wrap -> fmt.Errorf with %w - etcd.go: goerrors alias removed, use stdlib errors.As - nats.go: errors.Wrap/Is/New -> stdlib equivalents - postgresql.go: goerrors.Wrap -> fmt.Errorf with %w Part 2 of 4 in the pkg/errors migration. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: migrate internal packages from pkg/errors to stdlib (partial) Replace github.com/pkg/errors with Go standard library error handling in internal packages: - internal/builders/controlplane: errors.Wrap -> fmt.Errorf - internal/crypto: errors.Wrap -> fmt.Errorf - internal/kubeadm: errors.Wrap/Wrapf -> fmt.Errorf - internal/upgrade: errors.Wrap -> fmt.Errorf - internal/webhook: errors.Wrap -> fmt.Errorf Part 3 of 4 in the pkg/errors migration. Remaining files: internal/resources/*.go (8 files, 42 occurrences) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(resources): migrate from pkg/errors to stdlib Replace github.com/pkg/errors with Go standard library: - errors.Wrap(err, msg) → fmt.Errorf("msg: %w", err) - errors.New(msg) → errors.New(msg) Files migrated: - internal/resources/kubeadm_phases.go - internal/resources/kubeadm_upgrade.go - internal/resources/kubeadm_utils.go - internal/resources/datastore/datastore_multitenancy.go - internal/resources/datastore/datastore_setup.go - internal/resources/datastore/datastore_storage_config.go - internal/resources/addons/coredns.go - internal/resources/addons/kube_proxy.go Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(controllers): migrate from pkg/errors to stdlib Replace github.com/pkg/errors with Go standard library: - errors.Wrap(err, msg) → fmt.Errorf("msg: %w", err) - errors.New(msg) → errors.New(msg) (stdlib) - errors.Is/As → errors.Is/As (stdlib) Files migrated: - controllers/datastore_controller.go - controllers/kubeconfiggenerator_controller.go - controllers/tenantcontrolplane_controller.go - controllers/telemetry_controller.go - controllers/certificate_lifecycle_controller.go Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(soot): migrate from pkg/errors to stdlib Replace github.com/pkg/errors with Go standard library: - errors.Is() now uses stdlib errors.Is() Files migrated: - controllers/soot/controllers/kubeproxy.go - controllers/soot/controllers/migrate.go - controllers/soot/controllers/coredns.go - controllers/soot/controllers/konnectivity.go - controllers/soot/controllers/kubeadm_phase.go Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(api,cmd): migrate from pkg/errors to stdlib Replace github.com/pkg/errors with Go standard library: - errors.Wrap(err, msg) → fmt.Errorf("msg: %w", err) Files migrated: - api/v1alpha1/tenantcontrolplane_funcs.go - cmd/utils/k8s_version.go Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * chore: run go mod tidy after pkg/errors migration The github.com/pkg/errors package moved from direct to indirect dependency. It remains as an indirect dependency because other packages in the dependency tree still use it. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(datastore): use errors.Is for sentinel error comparison The stdlib errors.As expects a pointer to a concrete error type, not a pointer to an error value. For comparing against sentinel errors like rpctypes.ErrGRPCUserNotFound, errors.Is should be used instead. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: resolve golangci-lint errors - Fix GCI import formatting (remove extra blank lines between groups) - Use errors.Is instead of errors.As for mutex sentinel errors Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(errors): use proper variable declarations for errors.As The errors.As function requires a pointer to an assignable variable, not a pointer to a composite literal. The previous pattern `errors.As(err, &SomeError{})` creates a pointer to a temporary value which errors.As cannot reliably use for assignment. This fix declares proper variables for each error type and passes their addresses to errors.As, ensuring correct error chain matching. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(datastore/etcd): use rpctypes.Error() for gRPC error comparison The etcd gRPC status errors (ErrGRPCUserNotFound, ErrGRPCRoleNotFound) cannot be compared directly using errors.Is() because they are wrapped in gRPC status errors during transmission. The etcd rpctypes package provides: - ErrGRPC* constants: server-side gRPC status errors - Err* constants (without GRPC prefix): client-side comparable errors - Error() function: converts gRPC errors to comparable EtcdError values The correct pattern is to use rpctypes.Error(err) to normalize the received error, then compare against client-side error constants like rpctypes.ErrUserNotFound. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
171 lines
5.8 KiB
Go
171 lines
5.8 KiB
Go
// Copyright 2022 Clastix Labs
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package kubeadm
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/blang/semver"
|
|
jsonpatchv5 "github.com/evanphx/json-patch/v5"
|
|
corev1 "k8s.io/api/core/v1"
|
|
rbacv1 "k8s.io/api/rbac/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/kubernetes"
|
|
kubelettypes "k8s.io/kubelet/config/v1beta1"
|
|
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
|
"k8s.io/kubernetes/cmd/kubeadm/app/phases/uploadconfig"
|
|
"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
|
|
"k8s.io/kubernetes/pkg/apis/rbac"
|
|
kubeletv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
|
|
|
|
"github.com/clastix/kamaji/internal/utilities"
|
|
)
|
|
|
|
const (
|
|
// kubeletConfigMapName defines base kubelet configuration ConfigMap name for kubeadm < 1.24.
|
|
kubeletConfigMapName = "kubelet-config-%d.%d"
|
|
)
|
|
|
|
// minVerUnversionedKubeletConfig defines minimum version from which kubeadm uses kubelet-config as a ConfigMap name.
|
|
var minVerUnversionedKubeletConfig = semver.MustParse("1.24.0")
|
|
|
|
func UploadKubeadmConfig(client kubernetes.Interface, config *Configuration) ([]byte, error) {
|
|
return nil, uploadconfig.UploadConfiguration(&config.InitConfiguration, client)
|
|
}
|
|
|
|
func UploadKubeletConfig(client kubernetes.Interface, config *Configuration, patches jsonpatchv5.Patch) ([]byte, error) {
|
|
kubeletConfiguration := KubeletConfiguration{
|
|
TenantControlPlaneDomain: config.InitConfiguration.Networking.DNSDomain,
|
|
TenantControlPlaneDNSServiceIPs: config.Parameters.TenantDNSServiceIPs,
|
|
TenantControlPlaneCgroupDriver: config.Parameters.TenantControlPlaneCGroupDriver,
|
|
}
|
|
|
|
content, err := getKubeletConfigmapContent(kubeletConfiguration, patches)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
configMapName, err := generateKubeletConfigMapName(config.Parameters.TenantControlPlaneVersion)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
configMap := &corev1.ConfigMap{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: configMapName,
|
|
Namespace: metav1.NamespaceSystem,
|
|
},
|
|
Data: map[string]string{
|
|
kubeadmconstants.KubeletBaseConfigurationConfigMapKey: string(content),
|
|
},
|
|
}
|
|
|
|
if err = apiclient.CreateOrUpdate[*corev1.ConfigMap](client.CoreV1().ConfigMaps(metav1.NamespaceSystem), configMap); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err = createConfigMapRBACRules(client, configMapName); err != nil {
|
|
return nil, fmt.Errorf("error creating kubelet configuration configmap RBAC rules: %w", err)
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
func getKubeletConfigmapContent(kubeletConfiguration KubeletConfiguration, patch jsonpatchv5.Patch) ([]byte, error) {
|
|
var kc kubelettypes.KubeletConfiguration
|
|
|
|
kubeletv1beta1.SetDefaults_KubeletConfiguration(&kc)
|
|
|
|
kc.APIVersion = kubeletv1beta1.SchemeGroupVersion.String()
|
|
kc.Kind = "KubeletConfiguration"
|
|
kc.Authentication.X509.ClientCAFile = "/etc/kubernetes/pki/ca.crt"
|
|
kc.CgroupDriver = kubeletConfiguration.TenantControlPlaneCgroupDriver
|
|
kc.ClusterDNS = kubeletConfiguration.TenantControlPlaneDNSServiceIPs
|
|
kc.ClusterDomain = kubeletConfiguration.TenantControlPlaneDomain
|
|
kc.RotateCertificates = true
|
|
kc.StaticPodPath = "/etc/kubernetes/manifests"
|
|
// TODO(prometherion): drop support of <= v1.27 TCP versions
|
|
// a numeric value is required due to strict marshaling
|
|
// kubeadm <= v1.27 has a different type for FlushFrequency
|
|
// https://github.com/kubernetes/component-base/blob/55b3ab0db0081303695d641b9b43d560bf3f7a65/logs/api/v1/types.go#L42-L45
|
|
kc.Logging.FlushFrequency.SerializeAsString = false
|
|
// Restore default behaviour so Kubelet will automatically
|
|
// determine the resolvConf location, as reported in clastix/kamaji#581.
|
|
kc.ResolverConfig = nil
|
|
|
|
if len(patch) > 0 {
|
|
kubeletConfig, patchErr := utilities.EncodeToJSON(&kc)
|
|
if patchErr != nil {
|
|
return nil, fmt.Errorf("unable to encode KubeletConfiguration to JSON for JSON patching: %w", patchErr)
|
|
}
|
|
|
|
if kubeletConfig, patchErr = patch.Apply(kubeletConfig); patchErr != nil {
|
|
return nil, fmt.Errorf("unable to apply JSON patching to KubeletConfiguration: %w", patchErr)
|
|
}
|
|
|
|
if patchErr = utilities.DecodeFromJSON(string(kubeletConfig), &kc); patchErr != nil {
|
|
return nil, fmt.Errorf("unable to decode JSON to KubeletConfiguration: %w", patchErr)
|
|
}
|
|
}
|
|
|
|
return utilities.EncodeToYaml(&kc)
|
|
}
|
|
|
|
func createConfigMapRBACRules(client kubernetes.Interface, configMapName string) error {
|
|
configMapRBACName := kubeadmconstants.KubeletBaseConfigMapRole
|
|
|
|
if err := apiclient.CreateOrUpdate[*rbacv1.Role](client.RbacV1().Roles(metav1.NamespaceSystem), &rbacv1.Role{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: configMapRBACName,
|
|
Namespace: metav1.NamespaceSystem,
|
|
},
|
|
Rules: []rbacv1.PolicyRule{
|
|
{
|
|
Verbs: []string{"get"},
|
|
APIGroups: []string{""},
|
|
Resources: []string{"configmaps"},
|
|
ResourceNames: []string{configMapName},
|
|
},
|
|
},
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
return apiclient.CreateOrUpdate[*rbacv1.RoleBinding](client.RbacV1().RoleBindings(metav1.NamespaceSystem), &rbacv1.RoleBinding{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: configMapRBACName,
|
|
Namespace: metav1.NamespaceSystem,
|
|
},
|
|
RoleRef: rbacv1.RoleRef{
|
|
APIGroup: rbac.GroupName,
|
|
Kind: "Role",
|
|
Name: configMapRBACName,
|
|
},
|
|
Subjects: []rbacv1.Subject{
|
|
{
|
|
Kind: rbac.GroupKind,
|
|
Name: kubeadmconstants.NodesGroup,
|
|
},
|
|
{
|
|
Kind: rbac.GroupKind,
|
|
Name: kubeadmconstants.NodeBootstrapTokenAuthGroup,
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func generateKubeletConfigMapName(version string) (string, error) {
|
|
parsedVersion, err := semver.ParseTolerant(version)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to parse kubernetes version %q: %w", version, err)
|
|
}
|
|
|
|
majorMinor := semver.Version{Major: parsedVersion.Major, Minor: parsedVersion.Minor}
|
|
if majorMinor.GTE(minVerUnversionedKubeletConfig) {
|
|
return kubeadmconstants.KubeletBaseConfigurationConfigMap, nil
|
|
}
|
|
|
|
return fmt.Sprintf(kubeletConfigMapName, parsedVersion.Major, parsedVersion.Minor), nil
|
|
}
|