Merge pull request #28 from zqzten/tweak

Various tweaks

Author: dayko2019

config/manager/manager.yaml

@@ -36,35 +36,8 @@ spec:
       labels:
         control-plane: controller-manager
     spec:
-      # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution. 
-      # It is considered best practice to support multiple architectures. You can
-      # build your manager image using the makefile target docker-buildx.
-      # affinity:
-      #   nodeAffinity:
-      #     requiredDuringSchedulingIgnoredDuringExecution:
-      #       nodeSelectorTerms:
-      #         - matchExpressions:
-      #           - key: kubernetes.io/arch
-      #             operator: In
-      #             values:
-      #               - amd64
-      #               - arm64
-      #               - ppc64le
-      #               - s390x
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
       securityContext:
         runAsNonRoot: true
-        # TODO(user): For common cases that do not require escalating privileges
-        # it is recommended to ensure that all your Pods/Containers are restrictive.
-        # More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
-        # Please uncomment the following code if your project does NOT have to work on old Kubernetes
-        # versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
-        # seccompProfile:
-        #   type: RuntimeDefault
       containers:
       - command:
         - /manager
@@ -76,7 +49,7 @@ spec:
           allowPrivilegeEscalation: false
           capabilities:
             drop:
-              - "ALL"
+            - ALL
         livenessProbe:
           httpGet:
             path: /healthz
@@ -89,14 +62,5 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
-        # TODO(user): Configure the resources accordingly based on the project requirements.
-        # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-        resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
-          requests:
-            cpu: 10m
-            memory: 64Mi
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10

main.go

@@ -96,8 +96,9 @@ func main() {
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
 	flag.IntVar(&reconcileConcurrency, "reconcile-concurrency", 1, "The reconciliation concurrency of each controller.")
-	flag.StringVar(&metricProviderType, "metric-provider", "prometheus", "todo")
-	flag.StringVar(&promAddress, "prometheus-address", "", "todo")
+	flag.StringVar(&metricProviderType, "metric-provider", "prometheus",
+		"The name of metric provider. Valid options are prometheus or metrics-api. Defaults to prometheus.")
+	flag.StringVar(&promAddress, "prometheus-address", "", "The address of the Prometheus to connect to.")
 	opts := zap.Options{
 		Development: true,
 		TimeEncoder: zapcore.RFC3339TimeEncoder,

pkg/metric/provider/metricsapi/provider_test.go

@@ -108,7 +108,7 @@ func TestQueryLatest(t *testing.T) {
 		fakeMetricsClient := prepareFakeMetricsClient(testPod, testCase.resourceName, testCase.timeMetrics)
 		metricsProvider := NewMetricProvider(fakeMetricsClient.MetricsV1beta1())
 
-		samples, err := metricsProvider.QueryLatest(context.TODO(), testCase.query)
+		samples, err := metricsProvider.QueryLatest(context.Background(), testCase.query)
 		assert.Nil(t, err, "failed to query latest metrics")
 		for _, sample := range samples {
 			assert.Equal(t, testCase.timeResultMap[sample.Timestamp.Unix()], sample.Value, "unexpected result")
@@ -140,7 +140,7 @@ func TestQuery(t *testing.T) {
 		fakeMetricsClient := prepareFakeMetricsClient(testPod, testCase.resourceName, testCase.timeMetrics)
 		metricsProvider := NewMetricProvider(fakeMetricsClient.MetricsV1beta1())
 
-		timeSeries, err := metricsProvider.Query(context.TODO(), testCase.query, startTime, endTime, timeStepInMinute)
+		timeSeries, err := metricsProvider.Query(context.Background(), testCase.query, startTime, endTime, timeStepInMinute)
 
 		assert.NotNil(t, err, "MetricsAPI does not support query operation")
 		assert.Nil(t, timeSeries, "MetricsAPI does not support query operation")

pkg/metric/provider/prometheus/provider_test.go

@@ -196,7 +196,7 @@ func TestQuery(t *testing.T) {
 	})).WithObjects().Build()
 	for _, testCase := range testCases {
 		fakeMetricClient := newFakeMetricProvider(fakeClient, testCase.timeSeries)
-		series, err := fakeMetricClient.Query(context.TODO(), testCase.query, testCase.start, testCase.end, time.Minute)
+		series, err := fakeMetricClient.Query(context.Background(), testCase.query, testCase.start, testCase.end, time.Minute)
 
 		assert.Nil(t, err, "failed to query by prometheus for %v", testCase.query)
 		assert.NotNil(t, series)
@@ -237,7 +237,7 @@ func TestQueryLatest(t *testing.T) {
 	})).WithObjects().Build()
 	for _, testCase := range testCases {
 		fakeMetricClient := newFakeMetricProvider(fakeClient, testCase.timeSeries)
-		samples, err := fakeMetricClient.QueryLatest(context.TODO(), testCase.query)
+		samples, err := fakeMetricClient.QueryLatest(context.Background(), testCase.query)
 
 		assert.Nil(t, err, "failed to query latest by prometheus for %v", testCase.query)
 		assert.NotNil(t, samples)

pkg/pod/state_test.go

@@ -252,7 +252,7 @@ func TestCalculateStateChange(t *testing.T) {
 		statefulSet := &workload.StatefulSet{}
 		stateManager := NewStateManager(testCase.rp, statefulSet, currentPodMap)
 
-		stateChange, err := stateManager.CalculateStateChange(context.TODO())
+		stateChange, err := stateManager.CalculateStateChange(context.Background())
 		assert.Nil(t, err)
 		assert.Equal(t, testCase.toOnlinePodNum, len(stateChange.Online), "to online pod num is error for %s", testCase.name)
 		assert.Equal(t, testCase.toCutoffPodNum, len(stateChange.Cutoff), "to cutoff pod num is error for %s", testCase.name)

pkg/pod/traffic/readinessgate_test.go

@@ -46,16 +46,16 @@ func TestOn(t *testing.T) {
 	}
 	// create pod
 	for _, pod := range pods {
-		assert.Nil(t, fakeClient.Create(context.TODO(), pod))
+		assert.Nil(t, fakeClient.Create(context.Background(), pod))
 	}
 	defer cleanPods(fakeClient, pods)
 
-	err := readinessGate.On(context.TODO(), pods)
+	err := readinessGate.On(context.Background(), pods)
 	assert.Nil(t, err)
 
 	podList := &corev1.PodList{}
 	ls, _ := labels.Parse("foo=bar")
-	assert.Nil(t, fakeClient.List(context.TODO(), podList, &client.ListOptions{LabelSelector: ls}))
+	assert.Nil(t, fakeClient.List(context.Background(), podList, &client.ListOptions{LabelSelector: ls}))
 
 	for _, pod := range podList.Items {
 		assert.NotNil(t, pod.Status, "pod status should not nil for %s", pod.Name)
@@ -83,16 +83,16 @@ func TestOff(t *testing.T) {
 
 	// create pod
 	for _, pod := range pods {
-		assert.Nil(t, fakeClient.Create(context.TODO(), pod))
+		assert.Nil(t, fakeClient.Create(context.Background(), pod))
 	}
 	defer cleanPods(fakeClient, pods)
 
-	err := readinessGate.Off(context.TODO(), pods)
+	err := readinessGate.Off(context.Background(), pods)
 	assert.Nil(t, err)
 
 	podList := &corev1.PodList{}
 	ls, _ := labels.Parse("foo=bar")
-	assert.Nil(t, fakeClient.List(context.TODO(), podList, &client.ListOptions{LabelSelector: ls}))
+	assert.Nil(t, fakeClient.List(context.Background(), podList, &client.ListOptions{LabelSelector: ls}))
 
 	for _, pod := range podList.Items {
 		assert.NotNil(t, pod.Status, "pod status should not nil for %s", pod.Name)
@@ -113,6 +113,6 @@ func hasExpectedTraffic(conditions []corev1.PodCondition, expectedStatus corev1.
 
 func cleanPods(c client.Client, pods []*corev1.Pod) {
 	for _, pod := range pods {
-		_ = c.Delete(context.TODO(), pod)
+		_ = c.Delete(context.Background(), pod)
 	}
 }

pkg/portrait/generator/reactive/generator_test.go

@@ -84,7 +84,7 @@ func TestGenerateHorizontal(t *testing.T) {
 		portraitGenerator := NewPortraitGenerator(fakeClient, fakeMetricProvider, fakeScaler)
 		assert.NotNil(t, portraitGenerator)
 
-		portraitData, _, _ := portraitGenerator.GenerateHorizontal(context.TODO(), testNamespace, scaleTargetRef, metricSpecs, algorithm)
+		portraitData, _, _ := portraitGenerator.GenerateHorizontal(context.Background(), testNamespace, scaleTargetRef, metricSpecs, algorithm)
 		assert.NotNil(t, portraitData)
 		assert.NotNil(t, portraitData.Static)
 		assert.Equal(t, testCase.targetReplicas, portraitData.Static.Replicas)

pkg/portrait/generator/reactive/metrics_test.go

@@ -44,7 +44,7 @@ func TestGetResourceMetric_UnsupportedResource(t *testing.T) {
 	metricsClient := metricsClient{}
 
 	selector, _ := labels.Parse("foo=bar")
-	_, err := metricsClient.GetResourceMetric(context.TODO(), corev1.ResourceStorage, testNamespace, selector, "test-container")
+	_, err := metricsClient.GetResourceMetric(context.Background(), corev1.ResourceStorage, testNamespace, selector, "test-container")
 	assert.NotNil(t, err, "unsupported resource for %s", corev1.ResourceStorage)
 }
 
@@ -69,7 +69,7 @@ func TestGetResourceMetric(t *testing.T) {
 
 		selector, _ := labels.Parse("name=test-pod")
 		// pod resources
-		podMetrics, err := metricsClient.GetResourceMetric(context.TODO(), testCase.resourceName, testNamespace, selector, "")
+		podMetrics, err := metricsClient.GetResourceMetric(context.Background(), testCase.resourceName, testNamespace, selector, "")
 		assert.Nil(t, err)
 
 		for podName, resValues := range testCase.podMetricsMap {
@@ -79,7 +79,7 @@ func TestGetResourceMetric(t *testing.T) {
 
 				// container resources
 				containerName := buildContainerName(podName, index+1)
-				containerMetrics, err := metricsClient.GetResourceMetric(context.TODO(), testCase.resourceName, testNamespace, selector, containerName)
+				containerMetrics, err := metricsClient.GetResourceMetric(context.Background(), testCase.resourceName, testNamespace, selector, containerName)
 				assert.Nil(t, err, "failed to get resource metrics")
 				assert.NotNil(t, containerMetrics, "container metrics not found for %s", containerName)
 				assert.Equal(t, containerValue, containerMetrics[podName].Value, "container metrics not expected for %s", containerName)