Clean up OCP 3.11 configurations

Signed-off-by: Dale Haiducek <[email protected]>
open-cluster-management-io · Feb 14, 2025 · 8dbf62d · 8dbf62d
1 parent a151d5a
commit 8dbf62d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -214,10 +214,11 @@ func setupLogging() {
 
 	klogV := flag.CommandLine.Lookup("v")
 	if klogV != nil {
-		var klogLevel int
+		var klogLevel int64
 
-		klogLevel, err = strconv.Atoi(klogV.Value.String())
+		klogLevel, err = strconv.ParseInt(klogV.Value.String(), 10, 8)
 		if err != nil {
+			// #nosec G115 -- ParseInt() guarantees that it's an int8
 			klogConfig.Level = zap.NewAtomicLevelAt(zapcore.Level(int8(-1 * klogLevel)))
 		}
 	}

diff --git a/pkg/addon/configpolicy/manifests/managedclusterchart/templates/service.yaml b/pkg/addon/configpolicy/manifests/managedclusterchart/templates/service.yaml
@@ -14,8 +14,6 @@ metadata:
     addon.open-cluster-management.io/hosted-manifest-location: hosting
   annotations:
     {{- if eq .Values.hostingKubernetesDistribution "OpenShift" }}
-    # The alpha annotation is required for OpenShift 3.11
-    service.alpha.openshift.io/serving-cert-secret-name: {{ include "controller.fullname" . }}-metrics
     service.beta.openshift.io/serving-cert-secret-name: {{ include "controller.fullname" . }}-metrics
     {{- end }}
 spec:

diff --git a/pkg/addon/policyframework/manifests/managedclusterchart/templates/service.yaml b/pkg/addon/policyframework/manifests/managedclusterchart/templates/service.yaml
@@ -14,8 +14,6 @@ metadata:
     addon.open-cluster-management.io/hosted-manifest-location: hosting
   annotations:
     {{- if eq .Values.hostingKubernetesDistribution "OpenShift" }}
-    # The alpha annotation is required for OpenShift 3.11
-    service.alpha.openshift.io/serving-cert-secret-name: {{ include "controller.fullname" . }}-metrics
     service.beta.openshift.io/serving-cert-secret-name: {{ include "controller.fullname" . }}-metrics
     {{- end }}
 spec: