From 755cc5bacdd4b18f901c083c9878677347d28e73 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Thu, 14 Dec 2023 10:47:52 +0100 Subject: [PATCH] refactor(golangci-lint): aligning to new linters Signed-off-by: Dario Tranchitella --- .github/workflows/ci.yaml | 2 +- .golangci.yml | 1 + Makefile | 2 +- cmd/root.go | 6 ------ controllers/soot/controllers/coredns.go | 2 +- controllers/soot/controllers/migrate.go | 6 +++--- e2e/suite_test.go | 4 ++-- e2e/tcp_additional_resources_blocked_test.go | 4 ++-- e2e/tcp_additional_resources_ready_test.go | 6 +++--- e2e/tcp_migration_test.go | 4 ++-- e2e/tcp_mysql_ready_test.go | 4 ++-- e2e/tcp_postgres_ready_test.go | 4 ++-- e2e/tcp_ready_test.go | 4 ++-- ...ation_preferredkubeletaddresstypes_test.go | 6 +++--- e2e/tcp_validation_version_downgrade_test.go | 4 ++-- e2e/tcp_validation_version_nonlinear_test.go | 4 ++-- e2e/tcp_validation_version_unsupport_test.go | 6 +++--- e2e/worker_kubeadm_join_test.go | 10 +++++----- e2e/worker_tcp_change_port_test.go | 4 ++-- internal/builders/controlplane/deployment.go | 20 +++++++++---------- .../controlplane/konnectivity_server.go | 11 +++++----- internal/datastore/connection.go | 2 +- internal/datastore/etcd.go | 2 +- internal/datastore/mysql.go | 8 ++++++-- internal/datastore/postgresql.go | 2 +- internal/kubeadm/kubeconfig.go | 5 +---- internal/kubeadm/printers/discard.go | 14 ++++++------- internal/kubeadm/uploadconfig.go | 10 +++++----- internal/resources/addons/kube_proxy.go | 4 ++-- .../resources/datastore/datastore_migrate.go | 5 +---- .../datastore/datastore_storage_config.go | 2 +- internal/resources/k8s_ingress_resource.go | 4 ++-- internal/resources/konnectivity/agent.go | 6 +++--- .../konnectivity/certificate_resource.go | 4 ++-- .../egress_selector_configuration_resource.go | 8 ++++---- internal/resources/kubeadm_config.go | 8 ++------ internal/resources/kubeconfig.go | 2 +- internal/resources/utils/utils.go | 2 -- internal/utilities/utilities.go | 4 ++-- internal/webhook/handlers/ds_validate.go | 6 +----- internal/webhook/handlers/tcp_defaults.go | 6 +++--- 41 files changed, 100 insertions(+), 118 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5a42d85..b2cb62b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: - name: Run golangci-lint uses: golangci/golangci-lint-action@v3.2.0 with: - version: v1.49.0 + version: v1.54.2 only-new-issues: false args: --timeout 5m --config .golangci.yml diff: diff --git a/.golangci.yml b/.golangci.yml index 5bc2b91..f1fec67 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,7 @@ linters-settings: linters: disable: + - depguard - wrapcheck - gomnd - scopelint diff --git a/Makefile b/Makefile index 4508845..d724968 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ controller-gen: ## Download controller-gen locally if necessary. GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint golangci-lint: ## Download golangci-lint locally if necessary. - $(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0) + $(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2) KUSTOMIZE = $(shell pwd)/bin/kustomize kustomize: ## Download kustomize locally if necessary. diff --git a/cmd/root.go b/cmd/root.go index 4fa2262..d137a0c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,9 +4,6 @@ package cmd import ( - "math/rand" - "time" - "github.com/spf13/cobra" _ "go.uber.org/automaxprocs" // Automatically set `GOMAXPROCS` to match Linux container CPU quota. "k8s.io/apimachinery/pkg/runtime" @@ -22,9 +19,6 @@ func NewCmd(scheme *runtime.Scheme) *cobra.Command { Use: "kamaji", Short: "Build and operate Kubernetes at scale with a fraction of operational burden.", PersistentPreRun: func(cmd *cobra.Command, args []string) { - // Seed is required to ensure non reproducibility for the certificates generate by Kamaji. - rand.Seed(time.Now().UnixNano()) - utilruntime.Must(clientgoscheme.AddToScheme(scheme)) utilruntime.Must(kamajiv1alpha1.AddToScheme(scheme)) utilruntime.Must(appsv1.RegisterDefaults(scheme)) diff --git a/controllers/soot/controllers/coredns.go b/controllers/soot/controllers/coredns.go index ce3b8b2..595ebb1 100644 --- a/controllers/soot/controllers/coredns.go +++ b/controllers/soot/controllers/coredns.go @@ -35,7 +35,7 @@ type CoreDNS struct { TriggerChannel chan event.GenericEvent } -func (c *CoreDNS) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { +func (c *CoreDNS) Reconcile(ctx context.Context, _ reconcile.Request) (reconcile.Result, error) { tcp, err := c.GetTenantControlPlaneFunc() if err != nil { c.logger.Error(err, "cannot retrieve TenantControlPlane") diff --git a/controllers/soot/controllers/migrate.go b/controllers/soot/controllers/migrate.go index 3445a44..5d2e9fe 100644 --- a/controllers/soot/controllers/migrate.go +++ b/controllers/soot/controllers/migrate.go @@ -11,7 +11,7 @@ import ( admissionregistrationv1 "k8s.io/api/admissionregistration/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" @@ -84,7 +84,7 @@ func (m *Migrate) createOrUpdate(ctx context.Context) error { { Name: "leases.migrate.kamaji.clastix.io", ClientConfig: admissionregistrationv1.WebhookClientConfig{ - URL: pointer.String(fmt.Sprintf("https://%s.%s.svc:443/migrate", m.WebhookServiceName, m.WebhookNamespace)), + URL: pointer.To(fmt.Sprintf("https://%s.%s.svc:443/migrate", m.WebhookServiceName, m.WebhookNamespace)), CABundle: m.WebhookCABundle, }, Rules: []admissionregistrationv1.RuleWithOperations{ @@ -128,7 +128,7 @@ func (m *Migrate) createOrUpdate(ctx context.Context) error { { Name: "catchall.migrate.kamaji.clastix.io", ClientConfig: admissionregistrationv1.WebhookClientConfig{ - URL: pointer.String(fmt.Sprintf("https://%s.%s.svc:443/migrate", m.WebhookServiceName, m.WebhookNamespace)), + URL: pointer.To(fmt.Sprintf("https://%s.%s.svc:443/migrate", m.WebhookServiceName, m.WebhookNamespace)), CABundle: m.WebhookCABundle, }, Rules: []admissionregistrationv1.RuleWithOperations{ diff --git a/e2e/suite_test.go b/e2e/suite_test.go index 400819f..8e99892 100644 --- a/e2e/suite_test.go +++ b/e2e/suite_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" @@ -44,7 +44,7 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - UseExistingCluster: pointer.Bool(true), + UseExistingCluster: pointer.To(true), } var err error diff --git a/e2e/tcp_additional_resources_blocked_test.go b/e2e/tcp_additional_resources_blocked_test.go index b96d52d..08f0660 100644 --- a/e2e/tcp_additional_resources_blocked_test.go +++ b/e2e/tcp_additional_resources_blocked_test.go @@ -12,7 +12,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -27,7 +27,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional resources Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), AdditionalInitContainers: []corev1.Container{{ Name: initContainerName, Image: initContainerImage, diff --git a/e2e/tcp_additional_resources_ready_test.go b/e2e/tcp_additional_resources_ready_test.go index 5d7fcd2..e836324 100644 --- a/e2e/tcp_additional_resources_ready_test.go +++ b/e2e/tcp_additional_resources_ready_test.go @@ -15,7 +15,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" "github.com/clastix/kamaji/internal/utilities" @@ -43,7 +43,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional options", Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), AdditionalInitContainers: []corev1.Container{{ Name: initContainerName, Image: initContainerImage, @@ -256,7 +256,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional options", }, &deploy)).NotTo(HaveOccurred()) return deploy.Spec.Template.Spec.InitContainers - }, 10*time.Second, time.Second).Should(HaveLen(0), "Deployment should not contain anymore the init container") + }, 10*time.Second, time.Second).Should(BeEmpty(), "Deployment should not contain anymore the init container") Eventually(func() bool { deploy := appsv1.Deployment{} diff --git a/e2e/tcp_migration_test.go b/e2e/tcp_migration_test.go index b257657..db2df85 100644 --- a/e2e/tcp_migration_test.go +++ b/e2e/tcp_migration_test.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/tools/clientcmd" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" @@ -36,7 +36,7 @@ var _ = Describe("When migrating a Tenant Control Plane to another datastore", f DataStore: "etcd-bronze", ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "NodePort", diff --git a/e2e/tcp_mysql_ready_test.go b/e2e/tcp_mysql_ready_test.go index 17b48fd..bab7adb 100644 --- a/e2e/tcp_mysql_ready_test.go +++ b/e2e/tcp_mysql_ready_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -25,7 +25,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with the MySQL driver", f DataStore: "mysql-bronze", ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/tcp_postgres_ready_test.go b/e2e/tcp_postgres_ready_test.go index 77ad521..490abaf 100644 --- a/e2e/tcp_postgres_ready_test.go +++ b/e2e/tcp_postgres_ready_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -25,7 +25,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with the PostgreSQL drive DataStore: "postgresql-bronze", ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/tcp_ready_test.go b/e2e/tcp_ready_test.go index 705138a..252ed7b 100644 --- a/e2e/tcp_ready_test.go +++ b/e2e/tcp_ready_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -24,7 +24,7 @@ var _ = Describe("Deploy a TenantControlPlane resource", func() { Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/tcp_validation_preferredkubeletaddresstypes_test.go b/e2e/tcp_validation_preferredkubeletaddresstypes_test.go index 38e7e23..2721f23 100644 --- a/e2e/tcp_validation_preferredkubeletaddresstypes_test.go +++ b/e2e/tcp_validation_preferredkubeletaddresstypes_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -27,7 +27,7 @@ var _ = Describe("Deploy a TenantControlPlane with wrong preferred kubelet addre DataStore: "default", ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", @@ -63,7 +63,7 @@ var _ = Describe("Deploy a TenantControlPlane with wrong preferred kubelet addre DataStore: "default", ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/tcp_validation_version_downgrade_test.go b/e2e/tcp_validation_version_downgrade_test.go index cf1ff63..8e16b4d 100644 --- a/e2e/tcp_validation_version_downgrade_test.go +++ b/e2e/tcp_validation_version_downgrade_test.go @@ -11,7 +11,7 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -26,7 +26,7 @@ var _ = Describe("downgrade of a TenantControlPlane Kubernetes version", func() Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/tcp_validation_version_nonlinear_test.go b/e2e/tcp_validation_version_nonlinear_test.go index 16fad45..819b67e 100644 --- a/e2e/tcp_validation_version_nonlinear_test.go +++ b/e2e/tcp_validation_version_nonlinear_test.go @@ -11,7 +11,7 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -26,7 +26,7 @@ var _ = Describe("non-linear minor upgrade of a TenantControlPlane Kubernetes ve Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/tcp_validation_version_unsupport_test.go b/e2e/tcp_validation_version_unsupport_test.go index 3140f6c..570f110 100644 --- a/e2e/tcp_validation_version_unsupport_test.go +++ b/e2e/tcp_validation_version_unsupport_test.go @@ -13,7 +13,7 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" "github.com/clastix/kamaji/internal/upgrade" @@ -36,7 +36,7 @@ var _ = Describe("using an unsupported TenantControlPlane Kubernetes version", f Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", @@ -64,7 +64,7 @@ var _ = Describe("using an unsupported TenantControlPlane Kubernetes version", f Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "ClusterIP", diff --git a/e2e/worker_kubeadm_join_test.go b/e2e/worker_kubeadm_join_test.go index 045b644..11149fe 100644 --- a/e2e/worker_kubeadm_join_test.go +++ b/e2e/worker_kubeadm_join_test.go @@ -19,9 +19,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" + kubeadmv1beta3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/cmd" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -44,7 +44,7 @@ var _ = Describe("starting a kind worker with kubeadm", func() { Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "NodePort", @@ -121,7 +121,7 @@ var _ = Describe("starting a kind worker with kubeadm", func() { var joinCommandBuffer *bytes.Buffer By("generating kubeadm join command", func() { - joinCommandBuffer = bytes.NewBuffer([]byte("")) + joinCommandBuffer = bytes.NewBufferString("") config, err := clientcmd.BuildConfigFromFlags("", kubeconfigFile.Name()) Expect(err).ToNot(HaveOccurred()) @@ -129,7 +129,7 @@ var _ = Describe("starting a kind worker with kubeadm", func() { clientset, err := kubernetes.NewForConfig(config) Expect(err).ToNot(HaveOccurred()) - Expect(cmd.RunCreateToken(joinCommandBuffer, clientset, "", util.DefaultInitConfiguration(), true, "", kubeconfigFile.Name())).ToNot(HaveOccurred()) + Expect(cmd.RunCreateToken(joinCommandBuffer, clientset, "", &kubeadmv1beta3.InitConfiguration{}, true, "", kubeconfigFile.Name())).ToNot(HaveOccurred()) }) By("executing the command in the worker node", func() { diff --git a/e2e/worker_tcp_change_port_test.go b/e2e/worker_tcp_change_port_test.go index 2ccf820..8eeb7a5 100644 --- a/e2e/worker_tcp_change_port_test.go +++ b/e2e/worker_tcp_change_port_test.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" ) @@ -39,7 +39,7 @@ var _ = Describe("validating kubeconfig", func() { Spec: kamajiv1alpha1.TenantControlPlaneSpec{ ControlPlane: kamajiv1alpha1.ControlPlane{ Deployment: kamajiv1alpha1.DeploymentSpec{ - Replicas: pointer.Int32(1), + Replicas: pointer.To(int32(1)), }, Service: kamajiv1alpha1.ServiceSpec{ ServiceType: "NodePort", diff --git a/internal/builders/controlplane/deployment.go b/internal/builders/controlplane/deployment.go index 6164bcc..56355eb 100644 --- a/internal/builders/controlplane/deployment.go +++ b/internal/builders/controlplane/deployment.go @@ -20,7 +20,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" @@ -224,7 +224,7 @@ func (d Deployment) buildPKIVolume(podSpec *corev1.PodSpec, tcp kamajiv1alpha1.T podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Projected: &corev1.ProjectedVolumeSource{ Sources: sources, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -240,7 +240,7 @@ func (d Deployment) buildCAVolume(podSpec *corev1.PodSpec, tcp kamajiv1alpha1.Te podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.Certificates.CA.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -256,7 +256,7 @@ func (d Deployment) buildSSLCertsVolume(podSpec *corev1.PodSpec, tcp kamajiv1alp podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.Certificates.CA.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -272,7 +272,7 @@ func (d Deployment) buildShareCAVolume(podSpec *corev1.PodSpec, tcp kamajiv1alph podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.Certificates.CA.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -288,7 +288,7 @@ func (d Deployment) buildLocalShareCAVolume(podSpec *corev1.PodSpec, tcp kamajiv podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.Certificates.CA.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -304,7 +304,7 @@ func (d Deployment) buildSchedulerVolume(podSpec *corev1.PodSpec, tcp kamajiv1al podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.KubeConfig.Scheduler.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -320,7 +320,7 @@ func (d Deployment) buildControllerManagerVolume(podSpec *corev1.PodSpec, tcp ka podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.KubeConfig.ControllerManager.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } @@ -776,7 +776,7 @@ func (d Deployment) buildKineVolume(podSpec *corev1.PodSpec, tcp kamajiv1alpha1. podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: tcp.Status.Storage.Certificate.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } // Adding the volume to read Kine certificates: @@ -933,7 +933,7 @@ func (d Deployment) setReplicas(deploymentSpec *appsv1.DeploymentSpec, tcp kamaj func (d Deployment) setRuntimeClass(spec *corev1.PodSpec, tcp kamajiv1alpha1.TenantControlPlane) { if len(tcp.Spec.ControlPlane.Deployment.RuntimeClassName) > 0 { - spec.RuntimeClassName = pointer.String(tcp.Spec.ControlPlane.Deployment.RuntimeClassName) + spec.RuntimeClassName = pointer.To(tcp.Spec.ControlPlane.Deployment.RuntimeClassName) return } diff --git a/internal/builders/controlplane/konnectivity_server.go b/internal/builders/controlplane/konnectivity_server.go index 1153d29..5de3af2 100644 --- a/internal/builders/controlplane/konnectivity_server.go +++ b/internal/builders/controlplane/konnectivity_server.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" "github.com/clastix/kamaji/internal/utilities" @@ -186,7 +186,7 @@ func (k Konnectivity) buildVolumeMounts(podSpec *corev1.PodSpec) { podSpec.Containers[index].Args = utilities.ArgsFromMapToSlice(args) - vFound, vIndex := false, 0 + vFound, vIndex := false, 0 //nolint:wastedassign // Patching the volume mounts if vFound, vIndex = utilities.HasNamedVolumeMount(podSpec.Containers[index].VolumeMounts, konnectivityUDSVolume); !vFound { vIndex = len(podSpec.Containers[index].VolumeMounts) @@ -208,9 +208,8 @@ func (k Konnectivity) buildVolumeMounts(podSpec *corev1.PodSpec) { } func (k Konnectivity) buildVolumes(status kamajiv1alpha1.KonnectivityStatus, podSpec *corev1.PodSpec) { - found, index := false, 0 // Defining volumes for the UDS socket - found, index = utilities.HasNamedVolume(podSpec.Volumes, konnectivityUDSVolume) + found, index := utilities.HasNamedVolume(podSpec.Volumes, konnectivityUDSVolume) if !found { index = len(podSpec.Volumes) podSpec.Volumes = append(podSpec.Volumes, corev1.Volume{}) @@ -235,7 +234,7 @@ func (k Konnectivity) buildVolumes(status kamajiv1alpha1.KonnectivityStatus, pod LocalObjectReference: corev1.LocalObjectReference{ Name: status.ConfigMap.Name, }, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } // Defining volume for the Konnectivity kubeconfig @@ -249,7 +248,7 @@ func (k Konnectivity) buildVolumes(status kamajiv1alpha1.KonnectivityStatus, pod podSpec.Volumes[index].VolumeSource = corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: status.Kubeconfig.SecretName, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, } } diff --git a/internal/datastore/connection.go b/internal/datastore/connection.go index 5601c55..9a129a5 100644 --- a/internal/datastore/connection.go +++ b/internal/datastore/connection.go @@ -29,7 +29,7 @@ func NewStorageConnection(ctx context.Context, client client.Client, ds kamajiv1 return NewMySQLConnection(*cc) case kamajiv1alpha1.KinePostgreSQLDriver: cc.TLSConfig.ServerName = cc.Endpoints[0].Host - //nolint:contextcheck + return NewPostgreSQLConnection(*cc) case kamajiv1alpha1.EtcdDriver: return NewETCDConnection(*cc) diff --git a/internal/datastore/etcd.go b/internal/datastore/etcd.go index d4ab6aa..4a8b815 100644 --- a/internal/datastore/etcd.go +++ b/internal/datastore/etcd.go @@ -136,7 +136,7 @@ func (e *EtcdClient) DeleteDB(ctx context.Context, dbName string) error { return nil } -func (e *EtcdClient) RevokePrivileges(ctx context.Context, user, dbName string) error { +func (e *EtcdClient) RevokePrivileges(ctx context.Context, _, dbName string) error { if _, err := e.Client.Auth.RoleDelete(ctx, dbName); err != nil { return errors.NewRevokePrivilegesError(err) } diff --git a/internal/datastore/mysql.go b/internal/datastore/mysql.go index 671a726..ad003de 100644 --- a/internal/datastore/mysql.go +++ b/internal/datastore/mysql.go @@ -216,13 +216,17 @@ func (c *MySQLConnection) DBExists(ctx context.Context, dbName string) (bool, er return ok, nil } -func (c *MySQLConnection) GrantPrivilegesExists(ctx context.Context, user, dbName string) (bool, error) { +func (c *MySQLConnection) GrantPrivilegesExists(_ context.Context, user, dbName string) (bool, error) { statementShowGrantsStatement := fmt.Sprintf(mysqlShowGrantsStatement, user) - rows, err := c.db.Query(statementShowGrantsStatement) + rows, err := c.db.Query(statementShowGrantsStatement) //nolint:sqlclosecheck if err != nil { return false, errors.NewGrantPrivilegesError(err) } + if err = rows.Err(); err != nil { + return false, errors.NewGrantPrivilegesError(err) + } + expected := fmt.Sprintf(mysqlGrantPrivilegesStatement, user, dbName) var grant string diff --git a/internal/datastore/postgresql.go b/internal/datastore/postgresql.go index 088671a..a8ef652 100644 --- a/internal/datastore/postgresql.go +++ b/internal/datastore/postgresql.go @@ -78,7 +78,7 @@ func (r *PostgreSQLConnection) Migrate(ctx context.Context, tcp kamajiv1alpha1.T // Dumping the old datastore in a local buffer var buf bytes.Buffer - if _, err := r.switchDatabaseFn(tcp.Status.Storage.Setup.Schema).WithContext(ctx).CopyTo(&buf, "COPY kine TO STDOUT"); err != nil { //nolint:contextcheck + if _, err := r.switchDatabaseFn(tcp.Status.Storage.Setup.Schema).WithContext(ctx).CopyTo(&buf, "COPY kine TO STDOUT"); err != nil { return fmt.Errorf("unable to copy from the origin datastore: %w", err) } diff --git a/internal/kubeadm/kubeconfig.go b/internal/kubeadm/kubeconfig.go index 9722a22..d68a50f 100644 --- a/internal/kubeadm/kubeconfig.go +++ b/internal/kubeadm/kubeconfig.go @@ -26,11 +26,8 @@ func buildCertificateDirectoryWithCA(ca CertificatePrivateKeyPair, directory str } keyPath := path.Join(directory, kubeadmconstants.CAKeyName) - if err := os.WriteFile(keyPath, ca.PrivateKey, os.FileMode(0o600)); err != nil { - return err - } - return nil + return os.WriteFile(keyPath, ca.PrivateKey, os.FileMode(0o600)) } func CreateKubeconfig(kubeconfigName string, ca CertificatePrivateKeyPair, config *Configuration) ([]byte, error) { diff --git a/internal/kubeadm/printers/discard.go b/internal/kubeadm/printers/discard.go index f401b4e..cb3ed8c 100644 --- a/internal/kubeadm/printers/discard.go +++ b/internal/kubeadm/printers/discard.go @@ -11,28 +11,28 @@ import ( type Discard struct{} -func (d Discard) PrintObj(obj runtime.Object, writer io.Writer) error { +func (d Discard) PrintObj(runtime.Object, io.Writer) error { return nil } -func (d Discard) Fprintf(writer io.Writer, format string, args ...interface{}) (n int, err error) { +func (d Discard) Fprintf(io.Writer, string, ...interface{}) (n int, err error) { return } -func (d Discard) Fprintln(writer io.Writer, args ...interface{}) (n int, err error) { +func (d Discard) Fprintln(io.Writer, ...interface{}) (n int, err error) { return } -func (d Discard) Printf(format string, args ...interface{}) (n int, err error) { +func (d Discard) Printf(string, ...interface{}) (n int, err error) { return } -func (d Discard) Println(args ...interface{}) (n int, err error) { +func (d Discard) Println(...interface{}) (n int, err error) { return } -func (d Discard) Flush(writer io.Writer, last bool) { +func (d Discard) Flush(io.Writer, bool) { } -func (d Discard) Close(writer io.Writer) { +func (d Discard) Close(io.Writer) { } diff --git a/internal/kubeadm/uploadconfig.go b/internal/kubeadm/uploadconfig.go index debd7ca..0dc9e71 100644 --- a/internal/kubeadm/uploadconfig.go +++ b/internal/kubeadm/uploadconfig.go @@ -17,7 +17,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/phases/uploadconfig" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "github.com/clastix/kamaji/internal/utilities" ) @@ -81,10 +81,10 @@ func getKubeletConfigmapContent(kubeletConfiguration KubeletConfiguration) ([]by }, Authentication: kubelettypes.KubeletAuthentication{ Anonymous: kubelettypes.KubeletAnonymousAuthentication{ - Enabled: pointer.Bool(false), + Enabled: pointer.To(false), }, Webhook: kubelettypes.KubeletWebhookAuthentication{ - Enabled: pointer.Bool(true), + Enabled: pointer.To(true), CacheTTL: zeroDuration, }, X509: kubelettypes.KubeletX509Authentication{ @@ -110,9 +110,9 @@ func getKubeletConfigmapContent(kubeletConfiguration KubeletConfiguration) ([]by EvictionPressureTransitionPeriod: zeroDuration, FileCheckFrequency: zeroDuration, HealthzBindAddress: "127.0.0.1", - HealthzPort: pointer.Int32(10248), + HealthzPort: pointer.To(int32(10248)), HTTPCheckFrequency: zeroDuration, - ImageGCHighThresholdPercent: pointer.Int32(100), + ImageGCHighThresholdPercent: pointer.To(int32(100)), NodeStatusUpdateFrequency: zeroDuration, NodeStatusReportFrequency: zeroDuration, RotateCertificates: true, diff --git a/internal/resources/addons/kube_proxy.go b/internal/resources/addons/kube_proxy.go index e4a0b82..b7efc4b 100644 --- a/internal/resources/addons/kube_proxy.go +++ b/internal/resources/addons/kube_proxy.go @@ -13,7 +13,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" @@ -287,7 +287,7 @@ func (k *KubeProxy) mutateDaemonSet(ctx context.Context, tenantClient client.Cli ds.Spec.Template.Spec.Volumes[0].Name = k.daemonSet.Spec.Template.Spec.Volumes[0].Name ds.Spec.Template.Spec.Volumes[0].VolumeSource.ConfigMap = &corev1.ConfigMapVolumeSource{ LocalObjectReference: corev1.LocalObjectReference{Name: k.daemonSet.Spec.Template.Spec.Volumes[0].VolumeSource.ConfigMap.Name}, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), } ds.Spec.Template.Spec.Volumes[1].Name = k.daemonSet.Spec.Template.Spec.Volumes[1].Name diff --git a/internal/resources/datastore/datastore_migrate.go b/internal/resources/datastore/datastore_migrate.go index ccabf8e..74a45b9 100644 --- a/internal/resources/datastore/datastore_migrate.go +++ b/internal/resources/datastore/datastore_migrate.go @@ -64,11 +64,8 @@ func (d *Migrate) Define(ctx context.Context, tenantControlPlane *kamajiv1alpha1 } d.desiredDatastore = &kamajiv1alpha1.DataStore{} - if err := d.Client.Get(ctx, types.NamespacedName{Name: tenantControlPlane.Spec.DataStore}, d.desiredDatastore); err != nil { - return err - } - return nil + return d.Client.Get(ctx, types.NamespacedName{Name: tenantControlPlane.Spec.DataStore}, d.desiredDatastore) } func (d *Migrate) ShouldCleanup(tcp *kamajiv1alpha1.TenantControlPlane) bool { diff --git a/internal/resources/datastore/datastore_storage_config.go b/internal/resources/datastore/datastore_storage_config.go index 9b99153..5a750fb 100644 --- a/internal/resources/datastore/datastore_storage_config.go +++ b/internal/resources/datastore/datastore_storage_config.go @@ -67,7 +67,7 @@ func (r *Config) CreateOrUpdate(ctx context.Context, tenantControlPlane *kamajiv return utilities.CreateOrUpdateWithConflict(ctx, r.Client, r.resource, r.mutate(ctx, tenantControlPlane)) } -func (r *Config) Delete(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { +func (r *Config) Delete(ctx context.Context, _ *kamajiv1alpha1.TenantControlPlane) error { secret := r.resource.DeepCopy() if err := r.Client.Get(ctx, types.NamespacedName{Name: r.resource.Name, Namespace: r.resource.Namespace}, secret); err != nil { diff --git a/internal/resources/k8s_ingress_resource.go b/internal/resources/k8s_ingress_resource.go index b8ffec0..def340c 100644 --- a/internal/resources/k8s_ingress_resource.go +++ b/internal/resources/k8s_ingress_resource.go @@ -10,7 +10,7 @@ import ( networkingv1 "k8s.io/api/networking/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" @@ -119,7 +119,7 @@ func (r *KubernetesIngressResource) mutate(tenantControlPlane *kamajiv1alpha1.Te } path.Path = "/" - path.PathType = (*networkingv1.PathType)(pointer.String(string(networkingv1.PathTypePrefix))) + path.PathType = (*networkingv1.PathType)(pointer.To(string(networkingv1.PathTypePrefix))) if path.Backend.Service == nil { path.Backend.Service = &networkingv1.IngressServiceBackend{} diff --git a/internal/resources/konnectivity/agent.go b/internal/resources/konnectivity/agent.go index b432756..c99113b 100644 --- a/internal/resources/konnectivity/agent.go +++ b/internal/resources/konnectivity/agent.go @@ -12,7 +12,7 @@ import ( k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" @@ -146,11 +146,11 @@ func (r *Agent) mutate(ctx context.Context, tenantControlPlane *kamajiv1alpha1.T ServiceAccountToken: &corev1.ServiceAccountTokenProjection{ Path: agentTokenName, Audience: tenantControlPlane.Status.Addons.Konnectivity.ClusterRoleBinding.Name, - ExpirationSeconds: pointer.Int64(3600), + ExpirationSeconds: pointer.To(int64(3600)), }, }, }, - DefaultMode: pointer.Int32(420), + DefaultMode: pointer.To(int32(420)), }, }, }, diff --git a/internal/resources/konnectivity/certificate_resource.go b/internal/resources/konnectivity/certificate_resource.go index 97fd35e..8f48958 100644 --- a/internal/resources/konnectivity/certificate_resource.go +++ b/internal/resources/konnectivity/certificate_resource.go @@ -29,7 +29,7 @@ type CertificateResource struct { Client client.Client } -func (r *CertificateResource) ShouldStatusBeUpdated(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) bool { +func (r *CertificateResource) ShouldStatusBeUpdated(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) bool { return tenantControlPlane.Status.Addons.Konnectivity.Certificate.Checksum != utilities.GetObjectChecksum(r.resource) } @@ -72,7 +72,7 @@ func (r *CertificateResource) GetName() string { return "konnectivity-certificate" } -func (r *CertificateResource) UpdateTenantControlPlaneStatus(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { +func (r *CertificateResource) UpdateTenantControlPlaneStatus(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { if tenantControlPlane.Spec.Addons.Konnectivity != nil { tenantControlPlane.Status.Addons.Konnectivity.Certificate.LastUpdate = metav1.Now() tenantControlPlane.Status.Addons.Konnectivity.Certificate.SecretName = r.resource.GetName() diff --git a/internal/resources/konnectivity/egress_selector_configuration_resource.go b/internal/resources/konnectivity/egress_selector_configuration_resource.go index 2e7c33b..5641016 100644 --- a/internal/resources/konnectivity/egress_selector_configuration_resource.go +++ b/internal/resources/konnectivity/egress_selector_configuration_resource.go @@ -24,7 +24,7 @@ type EgressSelectorConfigurationResource struct { Client client.Client } -func (r *EgressSelectorConfigurationResource) Define(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { +func (r *EgressSelectorConfigurationResource) Define(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { r.resource = &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: utilities.AddTenantPrefix(r.GetName(), tenantControlPlane), @@ -39,7 +39,7 @@ func (r *EgressSelectorConfigurationResource) ShouldCleanup(tenantControlPlane * return tenantControlPlane.Spec.Addons.Konnectivity == nil } -func (r *EgressSelectorConfigurationResource) CleanUp(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) (bool, error) { +func (r *EgressSelectorConfigurationResource) CleanUp(ctx context.Context, _ *kamajiv1alpha1.TenantControlPlane) (bool, error) { logger := log.FromContext(ctx, "resource", r.GetName()) if err := r.Client.Delete(ctx, r.resource); err != nil { @@ -63,11 +63,11 @@ func (r *EgressSelectorConfigurationResource) GetName() string { return "konnectivity-egress-selector-configuration" } -func (r *EgressSelectorConfigurationResource) ShouldStatusBeUpdated(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) bool { +func (r *EgressSelectorConfigurationResource) ShouldStatusBeUpdated(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) bool { return tenantControlPlane.Status.Addons.Konnectivity.ConfigMap.Checksum != utilities.GetObjectChecksum(r.resource) } -func (r *EgressSelectorConfigurationResource) UpdateTenantControlPlaneStatus(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { +func (r *EgressSelectorConfigurationResource) UpdateTenantControlPlaneStatus(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { if tenantControlPlane.Spec.Addons.Konnectivity != nil { tenantControlPlane.Status.Addons.Konnectivity.ConfigMap.Name = r.resource.GetName() tenantControlPlane.Status.Addons.Konnectivity.ConfigMap.Checksum = utilities.GetObjectChecksum(r.resource) diff --git a/internal/resources/kubeadm_config.go b/internal/resources/kubeadm_config.go index b309c8a..9cb1576 100644 --- a/internal/resources/kubeadm_config.go +++ b/internal/resources/kubeadm_config.go @@ -61,7 +61,7 @@ func (r *KubeadmConfigResource) GetName() string { return "kubeadmconfig" } -func (r *KubeadmConfigResource) UpdateTenantControlPlaneStatus(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { +func (r *KubeadmConfigResource) UpdateTenantControlPlaneStatus(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { tenantControlPlane.Status.KubeadmConfig.LastUpdate = metav1.Now() tenantControlPlane.Status.KubeadmConfig.Checksum = utilities.GetObjectChecksum(r.resource) tenantControlPlane.Status.KubeadmConfig.ConfigmapName = r.resource.GetName() @@ -116,10 +116,6 @@ func (r *KubeadmConfigResource) mutate(ctx context.Context, tenantControlPlane * utilities.SetObjectChecksum(r.resource, r.resource.Data) - if err := ctrl.SetControllerReference(tenantControlPlane, r.resource, r.Client.Scheme()); err != nil { - return err - } - - return nil + return ctrl.SetControllerReference(tenantControlPlane, r.resource, r.Client.Scheme()) } } diff --git a/internal/resources/kubeconfig.go b/internal/resources/kubeconfig.go index d589bfa..a58bca4 100644 --- a/internal/resources/kubeconfig.go +++ b/internal/resources/kubeconfig.go @@ -57,7 +57,7 @@ func (r *KubeconfigResource) CleanUp(context.Context, *kamajiv1alpha1.TenantCont return false, nil } -func (r *KubeconfigResource) Define(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { +func (r *KubeconfigResource) Define(_ context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) error { r.resource = &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ Name: r.getPrefixedName(tenantControlPlane), diff --git a/internal/resources/utils/utils.go b/internal/resources/utils/utils.go index c6b3aaa..733dd60 100644 --- a/internal/resources/utils/utils.go +++ b/internal/resources/utils/utils.go @@ -5,7 +5,6 @@ package utils import ( "math/rand" - "time" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) @@ -33,7 +32,6 @@ func UpdateOperationResult(current controllerutil.OperationResult, op controller } func RandomString(n int) string { - rand.Seed(time.Now().UnixNano()) b := make([]byte, n) for i := range b { b[i] = letters[rand.Intn(len(letters))] diff --git a/internal/utilities/utilities.go b/internal/utilities/utilities.go index 524a7d1..310ac57 100644 --- a/internal/utilities/utilities.go +++ b/internal/utilities/utilities.go @@ -70,7 +70,7 @@ func DecodeFromYAML(o string, to runtime.Object) (err error) { Strict: false, }) - if to, _, err = encoder.Decode([]byte(o), nil, to); err != nil { //nolint:ineffassign,staticcheck + if to, _, err = encoder.Decode([]byte(o), nil, to); err != nil { //nolint:ineffassign,staticcheck,wastedassign return } @@ -86,7 +86,7 @@ func DecodeFromJSON(o string, to runtime.Object) (err error) { Strict: false, }) - if to, _, err = encoder.Decode([]byte(o), nil, to); err != nil { //nolint:ineffassign,staticcheck + if to, _, err = encoder.Decode([]byte(o), nil, to); err != nil { //nolint:ineffassign,staticcheck,wastedassign return } diff --git a/internal/webhook/handlers/ds_validate.go b/internal/webhook/handlers/ds_validate.go index d1cef8e..9f6e7e5 100644 --- a/internal/webhook/handlers/ds_validate.go +++ b/internal/webhook/handlers/ds_validate.go @@ -68,11 +68,7 @@ func (d DataStoreValidation) validate(ctx context.Context, ds kamajiv1alpha1.Dat } } - if err := d.validateTLSConfig(ctx, ds); err != nil { - return err - } - - return nil + return d.validateTLSConfig(ctx, ds) } func (d DataStoreValidation) validateBasicAuth(ctx context.Context, ds kamajiv1alpha1.DataStore) error { diff --git a/internal/webhook/handlers/tcp_defaults.go b/internal/webhook/handlers/tcp_defaults.go index c0ef1dc..2de905d 100644 --- a/internal/webhook/handlers/tcp_defaults.go +++ b/internal/webhook/handlers/tcp_defaults.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "gomodules.xyz/jsonpatch/v2" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/utils/pointer" + pointer "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1" @@ -37,7 +37,7 @@ func (t TenantControlPlaneDefaults) OnCreate(object runtime.Object) AdmissionRes } if tcp.Spec.ControlPlane.Deployment.Replicas == nil { - tcp.Spec.ControlPlane.Deployment.Replicas = pointer.Int32(2) + tcp.Spec.ControlPlane.Deployment.Replicas = pointer.To(int32(2)) } return nil, nil @@ -61,7 +61,7 @@ func (t TenantControlPlaneDefaults) OnUpdate(object runtime.Object, oldObject ru } if newTCP.Spec.ControlPlane.Deployment.Replicas == nil { - newTCP.Spec.ControlPlane.Deployment.Replicas = pointer.Int32(2) + newTCP.Spec.ControlPlane.Deployment.Replicas = pointer.To(int32(2)) } return nil, nil