From a5f6ed309a89230ddca356fbd83dd15c68d603ff Mon Sep 17 00:00:00 2001 From: enxebre Date: Mon, 5 Jun 2023 11:56:27 +0200 Subject: [PATCH] Remove alsologtostderr flag form CAP* This is needed to accomodate CAPI 1.4 coming in 4.14 payload https://main.cluster-api.sigs.k8s.io/developer/providers/migrations/v1.3-to-v1.4.html, https://github.com/kubernetes/enhancements/issues/2845, https://github.com/kubernetes/kubernetes/pull/112120 --- .../controllers/hostedcluster/hostedcluster_controller.go | 1 - .../controllers/hostedcluster/internal/platform/aws/aws.go | 1 - .../hostedcluster/internal/platform/kubevirt/kubevirt.go | 1 - .../hostedcluster/internal/platform/powervs/powervs.go | 1 - 4 files changed, 4 deletions(-) diff --git a/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go b/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go index 3a0af6f89d6..9f852845e6c 100644 --- a/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go +++ b/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go @@ -2638,7 +2638,6 @@ func reconcileCAPIManagerDeployment(deployment *appsv1.Deployment, hc *hyperv1.H }, }, Args: []string{"--namespace", "$(MY_NAMESPACE)", - "--alsologtostderr", "--v=4", "--leader-elect=true", fmt.Sprintf("--leader-elect-lease-duration=%s", config.RecommendedLeaseDuration), diff --git a/hypershift-operator/controllers/hostedcluster/internal/platform/aws/aws.go b/hypershift-operator/controllers/hostedcluster/internal/platform/aws/aws.go index 210dee10e6f..d14d54b633c 100644 --- a/hypershift-operator/controllers/hostedcluster/internal/platform/aws/aws.go +++ b/hypershift-operator/controllers/hostedcluster/internal/platform/aws/aws.go @@ -170,7 +170,6 @@ func (p AWS) CAPIProviderDeploymentSpec(hcluster *hyperv1.HostedCluster, hcp *hy }, }, Args: []string{"--namespace", "$(MY_NAMESPACE)", - "--alsologtostderr", "--v=4", "--leader-elect=true", "--feature-gates=EKS=false", diff --git a/hypershift-operator/controllers/hostedcluster/internal/platform/kubevirt/kubevirt.go b/hypershift-operator/controllers/hostedcluster/internal/platform/kubevirt/kubevirt.go index 250fe555fe9..91b42b6c59b 100644 --- a/hypershift-operator/controllers/hostedcluster/internal/platform/kubevirt/kubevirt.go +++ b/hypershift-operator/controllers/hostedcluster/internal/platform/kubevirt/kubevirt.go @@ -127,7 +127,6 @@ func (p Kubevirt) CAPIProviderDeploymentSpec(hcluster *hyperv1.HostedCluster, _ Command: []string{"/manager"}, Args: []string{ "--namespace", "$(MY_NAMESPACE)", - "--alsologtostderr", "--v=4", "--leader-elect=true", }, diff --git a/hypershift-operator/controllers/hostedcluster/internal/platform/powervs/powervs.go b/hypershift-operator/controllers/hostedcluster/internal/platform/powervs/powervs.go index 71c2d2849da..76f90483cf9 100644 --- a/hypershift-operator/controllers/hostedcluster/internal/platform/powervs/powervs.go +++ b/hypershift-operator/controllers/hostedcluster/internal/platform/powervs/powervs.go @@ -146,7 +146,6 @@ func (p PowerVS) CAPIProviderDeploymentSpec(hcluster *hyperv1.HostedCluster, _ * }, Command: []string{"/bin/cluster-api-provider-ibmcloud-controller-manager"}, Args: []string{"--namespace", "$(MY_NAMESPACE)", - "--alsologtostderr", "--v=4", "--leader-elect=true", "--powervs-provider-id-fmt=v2",