From 82d042f1366d9c68e9c171e14b0833d8c816e392 Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Tue, 2 Apr 2024 16:41:13 -0400 Subject: [PATCH] Cleanup formatting to follow consul-k8s standard (#3852) --- acceptance/framework/consul/helm_cluster.go | 168 +++++------------- .../webhook/consul_dataplane_sidecar.go | 66 ++----- .../connect-inject/webhook/container_init.go | 7 +- 3 files changed, 52 insertions(+), 189 deletions(-) diff --git a/acceptance/framework/consul/helm_cluster.go b/acceptance/framework/consul/helm_cluster.go index 02a8394ab5..e1b61870e1 100644 --- a/acceptance/framework/consul/helm_cluster.go +++ b/acceptance/framework/consul/helm_cluster.go @@ -155,12 +155,7 @@ func (h *HelmCluster) Create(t *testing.T) { } helm.Install(t, h.helmOptions, chartName, h.releaseName) - k8s.WaitForAllPodsToBeReady( - t, - h.kubernetesClient, - h.helmOptions.KubectlOptions.Namespace, - fmt.Sprintf("release=%s", h.releaseName), - ) + k8s.WaitForAllPodsToBeReady(t, h.kubernetesClient, h.helmOptions.KubectlOptions.Namespace, fmt.Sprintf("release=%s", h.releaseName)) } func (h *HelmCluster) Destroy(t *testing.T) { @@ -182,11 +177,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { require.NoError(t, err) // Forcibly delete all gateway classes and remove their finalizers. - _ = h.runtimeClient.DeleteAllOf( - context.Background(), - &gwv1beta1.GatewayClass{}, - client.HasLabels{"release=" + h.releaseName}, - ) + _ = h.runtimeClient.DeleteAllOf(context.Background(), &gwv1beta1.GatewayClass{}, client.HasLabels{"release=" + h.releaseName}) var gatewayClassList gwv1beta1.GatewayClassList if h.runtimeClient.List(context.Background(), &gatewayClassList, &client.ListOptions{ @@ -199,11 +190,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Forcibly delete all gateway class configs and remove their finalizers. - _ = h.runtimeClient.DeleteAllOf( - context.Background(), - &v1alpha1.GatewayClassConfig{}, - client.HasLabels{"release=" + h.releaseName}, - ) + _ = h.runtimeClient.DeleteAllOf(context.Background(), &v1alpha1.GatewayClassConfig{}, client.HasLabels{"release=" + h.releaseName}) var gatewayClassConfigList v1alpha1.GatewayClassConfigList if h.runtimeClient.List(context.Background(), &gatewayClassConfigList, &client.ListOptions{ @@ -227,13 +214,11 @@ func (h *HelmCluster) Destroy(t *testing.T) { // graceful termination takes a long time and since this is an uninstall // we don't care that they're stopped gracefully. pods, err := h.kubernetesClient.CoreV1().Pods(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) - require.NoError(t, err) + require.NoError(r, err) for _, pod := range pods.Items { if strings.Contains(pod.Name, h.releaseName) { var gracePeriod int64 = 0 - err := h.kubernetesClient.CoreV1(). - Pods(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), pod.Name, metav1.DeleteOptions{GracePeriodSeconds: &gracePeriod}) + err := h.kubernetesClient.CoreV1().Pods(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), pod.Name, metav1.DeleteOptions{GracePeriodSeconds: &gracePeriod}) if !errors.IsNotFound(err) { require.NoError(t, err) } @@ -241,9 +226,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Delete any deployments that have h.releaseName in their name. - deployments, err := h.kubernetesClient.AppsV1(). - Deployments(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + deployments, err := h.kubernetesClient.AppsV1().Deployments(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, deployment := range deployments.Items { if strings.Contains(deployment.Name, h.releaseName) { @@ -257,15 +240,11 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Delete any replicasets that have h.releaseName in their name. - replicasets, err := h.kubernetesClient.AppsV1(). - ReplicaSets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + replicasets, err := h.kubernetesClient.AppsV1().ReplicaSets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, replicaset := range replicasets.Items { if strings.Contains(replicaset.Name, h.releaseName) { - err := h.kubernetesClient.AppsV1(). - ReplicaSets(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), replicaset.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.AppsV1().ReplicaSets(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), replicaset.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(r, err) } @@ -273,15 +252,11 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Delete any statefulsets that have h.releaseName in their name. - statefulsets, err := h.kubernetesClient.AppsV1(). - StatefulSets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + statefulsets, err := h.kubernetesClient.AppsV1().StatefulSets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, statefulset := range statefulsets.Items { if strings.Contains(statefulset.Name, h.releaseName) { - err := h.kubernetesClient.AppsV1(). - StatefulSets(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), statefulset.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.AppsV1().StatefulSets(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), statefulset.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(r, err) } @@ -289,15 +264,11 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Delete any daemonsets that have h.releaseName in their name. - daemonsets, err := h.kubernetesClient.AppsV1(). - DaemonSets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + daemonsets, err := h.kubernetesClient.AppsV1().DaemonSets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, daemonset := range daemonsets.Items { if strings.Contains(daemonset.Name, h.releaseName) { - err := h.kubernetesClient.AppsV1(). - DaemonSets(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), daemonset.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.AppsV1().DaemonSets(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), daemonset.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(r, err) } @@ -305,15 +276,11 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Delete any services that have h.releaseName in their name. - services, err := h.kubernetesClient.CoreV1(). - Services(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + services, err := h.kubernetesClient.CoreV1().Services(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, service := range services.Items { if strings.Contains(service.Name, h.releaseName) { - err := h.kubernetesClient.CoreV1(). - Services(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), service.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.CoreV1().Services(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), service.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(r, err) } @@ -322,16 +289,14 @@ func (h *HelmCluster) Destroy(t *testing.T) { // Delete PVCs. err = h.kubernetesClient.CoreV1().PersistentVolumeClaims(h.helmOptions.KubectlOptions.Namespace).DeleteCollection(context.Background(), metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) - require.NoError(t, err) + require.NoError(r, err) // Delete any serviceaccounts that have h.releaseName in their name. sas, err := h.kubernetesClient.CoreV1().ServiceAccounts(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) - require.NoError(t, err) + require.NoError(r, err) for _, sa := range sas.Items { if strings.Contains(sa.Name, h.releaseName) { - err := h.kubernetesClient.CoreV1(). - ServiceAccounts(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), sa.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.CoreV1().ServiceAccounts(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), sa.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(t, err) } @@ -340,12 +305,10 @@ func (h *HelmCluster) Destroy(t *testing.T) { // Delete any roles that have h.releaseName in their name. roles, err := h.kubernetesClient.RbacV1().Roles(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) - require.NoError(t, err) + require.NoError(r, err) for _, role := range roles.Items { if strings.Contains(role.Name, h.releaseName) { - err := h.kubernetesClient.RbacV1(). - Roles(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), role.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.RbacV1().Roles(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), role.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(t, err) } @@ -354,12 +317,10 @@ func (h *HelmCluster) Destroy(t *testing.T) { // Delete any rolebindings that have h.releaseName in their name. roleBindings, err := h.kubernetesClient.RbacV1().RoleBindings(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) - require.NoError(t, err) + require.NoError(r, err) for _, roleBinding := range roleBindings.Items { if strings.Contains(roleBinding.Name, h.releaseName) { - err := h.kubernetesClient.RbacV1(). - RoleBindings(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), roleBinding.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.RbacV1().RoleBindings(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), roleBinding.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(t, err) } @@ -368,12 +329,10 @@ func (h *HelmCluster) Destroy(t *testing.T) { // Delete any secrets that have h.releaseName in their name. secrets, err := h.kubernetesClient.CoreV1().Secrets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{}) - require.NoError(t, err) + require.NoError(r, err) for _, secret := range secrets.Items { if strings.Contains(secret.Name, h.releaseName) { - err := h.kubernetesClient.CoreV1(). - Secrets(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), secret.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.CoreV1().Secrets(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), secret.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(t, err) } @@ -382,12 +341,10 @@ func (h *HelmCluster) Destroy(t *testing.T) { // Delete any jobs that have h.releaseName in their name. jobs, err := h.kubernetesClient.BatchV1().Jobs(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) - require.NoError(t, err) + require.NoError(r, err) for _, job := range jobs.Items { if strings.Contains(job.Name, h.releaseName) { - err := h.kubernetesClient.BatchV1(). - Jobs(h.helmOptions.KubectlOptions.Namespace). - Delete(context.Background(), job.Name, metav1.DeleteOptions{}) + err := h.kubernetesClient.BatchV1().Jobs(h.helmOptions.KubectlOptions.Namespace).Delete(context.Background(), job.Name, metav1.DeleteOptions{}) if !errors.IsNotFound(err) { require.NoError(t, err) } @@ -395,9 +352,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify that all deployments have been deleted. - deployments, err = h.kubernetesClient.AppsV1(). - Deployments(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + deployments, err = h.kubernetesClient.AppsV1().Deployments(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, deployment := range deployments.Items { if strings.Contains(deployment.Name, h.releaseName) { @@ -406,9 +361,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify that all replicasets have been deleted. - replicasets, err = h.kubernetesClient.AppsV1(). - ReplicaSets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + replicasets, err = h.kubernetesClient.AppsV1().ReplicaSets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, replicaset := range replicasets.Items { if strings.Contains(replicaset.Name, h.releaseName) { @@ -417,9 +370,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify that all statefulets have been deleted. - statefulsets, err = h.kubernetesClient.AppsV1(). - StatefulSets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + statefulsets, err = h.kubernetesClient.AppsV1().StatefulSets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, statefulset := range statefulsets.Items { if strings.Contains(statefulset.Name, h.releaseName) { @@ -428,9 +379,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify that all daemonsets have been deleted. - daemonsets, err = h.kubernetesClient.AppsV1(). - DaemonSets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + daemonsets, err = h.kubernetesClient.AppsV1().DaemonSets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, daemonset := range daemonsets.Items { if strings.Contains(daemonset.Name, h.releaseName) { @@ -439,9 +388,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify that all services have been deleted. - services, err = h.kubernetesClient.CoreV1(). - Services(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + services, err = h.kubernetesClient.CoreV1().Services(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, service := range services.Items { if strings.Contains(service.Name, h.releaseName) { @@ -450,9 +397,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify all Consul Pods are deleted. - pods, err = h.kubernetesClient.CoreV1(). - Pods(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + pods, err = h.kubernetesClient.CoreV1().Pods(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, pod := range pods.Items { if strings.Contains(pod.Name, h.releaseName) { @@ -461,16 +406,12 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify all Consul PVCs are deleted. - pvcs, err := h.kubernetesClient.CoreV1(). - PersistentVolumeClaims(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + pvcs, err := h.kubernetesClient.CoreV1().PersistentVolumeClaims(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) require.Len(r, pvcs.Items, 0) // Verify all Consul Service Accounts are deleted. - sas, err = h.kubernetesClient.CoreV1(). - ServiceAccounts(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + sas, err = h.kubernetesClient.CoreV1().ServiceAccounts(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, sa := range sas.Items { if strings.Contains(sa.Name, h.releaseName) { @@ -479,9 +420,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify all Consul Roles are deleted. - roles, err = h.kubernetesClient.RbacV1(). - Roles(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + roles, err = h.kubernetesClient.RbacV1().Roles(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, role := range roles.Items { if strings.Contains(role.Name, h.releaseName) { @@ -490,9 +429,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify all Consul Role Bindings are deleted. - roleBindings, err = h.kubernetesClient.RbacV1(). - RoleBindings(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + roleBindings, err = h.kubernetesClient.RbacV1().RoleBindings(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, roleBinding := range roleBindings.Items { if strings.Contains(roleBinding.Name, h.releaseName) { @@ -501,9 +438,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify all Consul Secrets are deleted. - secrets, err = h.kubernetesClient.CoreV1(). - Secrets(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{}) + secrets, err = h.kubernetesClient.CoreV1().Secrets(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{}) require.NoError(r, err) for _, secret := range secrets.Items { if strings.Contains(secret.Name, h.releaseName) { @@ -512,9 +447,7 @@ func (h *HelmCluster) Destroy(t *testing.T) { } // Verify all Consul Jobs are deleted. - jobs, err = h.kubernetesClient.BatchV1(). - Jobs(h.helmOptions.KubectlOptions.Namespace). - List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) + jobs, err = h.kubernetesClient.BatchV1().Jobs(h.helmOptions.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "release=" + h.releaseName}) require.NoError(r, err) for _, job := range jobs.Items { if strings.Contains(job.Name, h.releaseName) { @@ -533,12 +466,7 @@ func (h *HelmCluster) Upgrade(t *testing.T, helmValues map[string]string) { chartName = config.HelmChartPath } helm.Upgrade(t, h.helmOptions, chartName, h.releaseName) - k8s.WaitForAllPodsToBeReady( - t, - h.kubernetesClient, - h.helmOptions.KubectlOptions.Namespace, - fmt.Sprintf("release=%s", h.releaseName), - ) + k8s.WaitForAllPodsToBeReady(t, h.kubernetesClient, h.helmOptions.KubectlOptions.Namespace, fmt.Sprintf("release=%s", h.releaseName)) } func (h *HelmCluster) CreatePortForwardTunnel(t *testing.T, remotePort int, release ...string) string { @@ -695,9 +623,7 @@ func configurePodSecurityPolicies(t *testing.T, client kubernetes.Interface, cfg }, } - _, err = client.RbacV1(). - RoleBindings(namespace). - Create(context.Background(), pspRoleBinding, metav1.CreateOptions{}) + _, err = client.RbacV1().RoleBindings(namespace).Create(context.Background(), pspRoleBinding, metav1.CreateOptions{}) require.NoError(t, err) } else { require.NoError(t, err) @@ -741,14 +667,7 @@ func configureNamespace(t *testing.T, client kubernetes.Interface, cfg *config.T return } - require.Failf( - t, - "Failed to create or update namespace", - "Namespace=%s, CreateError=%s, UpdateError=%s", - namespace, - createErr, - updateErr, - ) + require.Failf(t, "Failed to create or update namespace", "Namespace=%s, CreateError=%s, UpdateError=%s", namespace, createErr, updateErr) } // configureSCCs creates RoleBindings that bind the default service account to cluster roles @@ -810,12 +729,7 @@ func defaultValues() map[string]string { return values } -func CreateK8sSecret( - t *testing.T, - client kubernetes.Interface, - cfg *config.TestConfig, - namespace, secretName, secretKey, secret string, -) { +func CreateK8sSecret(t *testing.T, client kubernetes.Interface, cfg *config.TestConfig, namespace, secretName, secretKey, secret string) { retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 15}, t, func(r *retry.R) { _, err := client.CoreV1().Secrets(namespace).Get(context.Background(), secretName, metav1.GetOptions{}) if errors.IsNotFound(err) { diff --git a/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go b/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go index 3f70468eb3..0c617c5c51 100644 --- a/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go +++ b/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go @@ -24,11 +24,7 @@ const ( consulDataplaneDNSBindPort = 8600 ) -func (w *MeshWebhook) consulDataplaneSidecar( - namespace corev1.Namespace, - pod corev1.Pod, - mpi multiPortInfo, -) (corev1.Container, error) { +func (w *MeshWebhook) consulDataplaneSidecar(namespace corev1.Namespace, pod corev1.Pod, mpi multiPortInfo) (corev1.Container, error) { resources, err := w.sidecarResources(pod) if err != nil { return corev1.Container{}, err @@ -273,12 +269,7 @@ func (w *MeshWebhook) consulDataplaneSidecar( return container, nil } -func (w *MeshWebhook) getContainerSidecarArgs( - namespace corev1.Namespace, - mpi multiPortInfo, - bearerTokenFile string, - pod corev1.Pod, -) ([]string, error) { +func (w *MeshWebhook) getContainerSidecarArgs(namespace corev1.Namespace, mpi multiPortInfo, bearerTokenFile string, pod corev1.Pod) ([]string, error) { proxyIDFileName := "/consul/connect-inject/proxyid" if mpi.serviceName != "" { proxyIDFileName = fmt.Sprintf("/consul/connect-inject/proxyid-%s", mpi.serviceName) @@ -413,14 +404,7 @@ func (w *MeshWebhook) getContainerSidecarArgs( } if serviceMetricsPath != "" && serviceMetricsPort != "" { - args = append( - args, - "-telemetry-prom-service-metrics-url="+fmt.Sprintf( - "http://127.0.0.1:%s%s", - serviceMetricsPort, - serviceMetricsPath, - ), - ) + args = append(args, "-telemetry-prom-service-metrics-url="+fmt.Sprintf("http://127.0.0.1:%s%s", serviceMetricsPort, serviceMetricsPath)) } // Pull the TLS config from the relevant annotations. @@ -447,23 +431,13 @@ func (w *MeshWebhook) getContainerSidecarArgs( // Validate required Prometheus TLS config is present if set. if prometheusCAFile != "" || prometheusCAPath != "" || prometheusCertFile != "" || prometheusKeyFile != "" { if prometheusCAFile == "" && prometheusCAPath == "" { - return nil, fmt.Errorf( - "must set one of %q or %q when providing prometheus TLS config", - constants.AnnotationPrometheusCAFile, - constants.AnnotationPrometheusCAPath, - ) + return nil, fmt.Errorf("must set one of %q or %q when providing prometheus TLS config", constants.AnnotationPrometheusCAFile, constants.AnnotationPrometheusCAPath) } if prometheusCertFile == "" { - return nil, fmt.Errorf( - "must set %q when providing prometheus TLS config", - constants.AnnotationPrometheusCertFile, - ) + return nil, fmt.Errorf("must set %q when providing prometheus TLS config", constants.AnnotationPrometheusCertFile) } if prometheusKeyFile == "" { - return nil, fmt.Errorf( - "must set %q when providing prometheus TLS config", - constants.AnnotationPrometheusKeyFile, - ) + return nil, fmt.Errorf("must set %q when providing prometheus TLS config", constants.AnnotationPrometheusKeyFile) } // TLS config has been validated, add them to the consul-dataplane cmd args args = append(args, "-telemetry-prom-ca-certs-file="+prometheusCAFile, @@ -543,12 +517,7 @@ func (w *MeshWebhook) sidecarResources(pod corev1.Pod) (corev1.ResourceRequireme if anno, ok := pod.Annotations[constants.AnnotationSidecarProxyCPULimit]; ok { cpuLimit, err := resource.ParseQuantity(anno) if err != nil { - return corev1.ResourceRequirements{}, fmt.Errorf( - "parsing annotation %s:%q: %s", - constants.AnnotationSidecarProxyCPULimit, - anno, - err, - ) + return corev1.ResourceRequirements{}, fmt.Errorf("parsing annotation %s:%q: %s", constants.AnnotationSidecarProxyCPULimit, anno, err) } resources.Limits[corev1.ResourceCPU] = cpuLimit } else if w.DefaultProxyCPULimit != zeroQuantity { @@ -559,12 +528,7 @@ func (w *MeshWebhook) sidecarResources(pod corev1.Pod) (corev1.ResourceRequireme if anno, ok := pod.Annotations[constants.AnnotationSidecarProxyCPURequest]; ok { cpuRequest, err := resource.ParseQuantity(anno) if err != nil { - return corev1.ResourceRequirements{}, fmt.Errorf( - "parsing annotation %s:%q: %s", - constants.AnnotationSidecarProxyCPURequest, - anno, - err, - ) + return corev1.ResourceRequirements{}, fmt.Errorf("parsing annotation %s:%q: %s", constants.AnnotationSidecarProxyCPURequest, anno, err) } resources.Requests[corev1.ResourceCPU] = cpuRequest } else if w.DefaultProxyCPURequest != zeroQuantity { @@ -575,12 +539,7 @@ func (w *MeshWebhook) sidecarResources(pod corev1.Pod) (corev1.ResourceRequireme if anno, ok := pod.Annotations[constants.AnnotationSidecarProxyMemoryLimit]; ok { memoryLimit, err := resource.ParseQuantity(anno) if err != nil { - return corev1.ResourceRequirements{}, fmt.Errorf( - "parsing annotation %s:%q: %s", - constants.AnnotationSidecarProxyMemoryLimit, - anno, - err, - ) + return corev1.ResourceRequirements{}, fmt.Errorf("parsing annotation %s:%q: %s", constants.AnnotationSidecarProxyMemoryLimit, anno, err) } resources.Limits[corev1.ResourceMemory] = memoryLimit } else if w.DefaultProxyMemoryLimit != zeroQuantity { @@ -591,12 +550,7 @@ func (w *MeshWebhook) sidecarResources(pod corev1.Pod) (corev1.ResourceRequireme if anno, ok := pod.Annotations[constants.AnnotationSidecarProxyMemoryRequest]; ok { memoryRequest, err := resource.ParseQuantity(anno) if err != nil { - return corev1.ResourceRequirements{}, fmt.Errorf( - "parsing annotation %s:%q: %s", - constants.AnnotationSidecarProxyMemoryRequest, - anno, - err, - ) + return corev1.ResourceRequirements{}, fmt.Errorf("parsing annotation %s:%q: %s", constants.AnnotationSidecarProxyMemoryRequest, anno, err) } resources.Requests[corev1.ResourceMemory] = memoryRequest } else if w.DefaultProxyMemoryRequest != zeroQuantity { diff --git a/control-plane/connect-inject/webhook/container_init.go b/control-plane/connect-inject/webhook/container_init.go index 48d893f6d6..7f82526f7d 100644 --- a/control-plane/connect-inject/webhook/container_init.go +++ b/control-plane/connect-inject/webhook/container_init.go @@ -300,12 +300,7 @@ func (w *MeshWebhook) containerInit(namespace corev1.Namespace, pod corev1.Pod, // consulDNSEnabled returns true if Consul DNS should be enabled for this pod. // It returns an error when the annotation value cannot be parsed by strconv.ParseBool or if we are unable // to read the pod's namespace label when it exists. -func consulDNSEnabled( - namespace corev1.Namespace, - pod corev1.Pod, - globalDNSEnabled bool, - globalTProxyEnabled bool, -) (bool, error) { +func consulDNSEnabled(namespace corev1.Namespace, pod corev1.Pod, globalDNSEnabled bool, globalTProxyEnabled bool) (bool, error) { // DNS is only possible when tproxy is also enabled because it relies // on traffic being redirected. tproxy, err := common.TransparentProxyEnabled(namespace, pod, globalTProxyEnabled)