Apply some quick fixes (#128)

spotify · Oct 13, 2021 · a30fbb6 · a30fbb6
1 parent f64b62e
commit a30fbb6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/controllers/batchscheduler/volcano/volcano.go b/controllers/batchscheduler/volcano/volcano.go
@@ -111,8 +111,10 @@ func newOwnerReference(flinkCluster *v1beta1.FlinkCluster) metav1.OwnerReference
 
 func (v *VolcanoBatchScheduler) syncPodGroup(cluster *v1beta1.FlinkCluster, size int32, minResource corev1.ResourceList) error {
 	var err error
+	var pg *scheduling.PodGroup
+
 	podGroupName := v.getPodGroupName(cluster)
-	if pg, err := v.volcanoClient.SchedulingV1beta1().PodGroups(cluster.Namespace).Get(context.TODO(), podGroupName, metav1.GetOptions{}); err != nil {
+	if pg, err = v.volcanoClient.SchedulingV1beta1().PodGroups(cluster.Namespace).Get(context.TODO(), podGroupName, metav1.GetOptions{}); err != nil {
 		if !errors.IsNotFound(err) {
 			return err
 		}

diff --git a/controllers/flinkcluster_converter.go b/controllers/flinkcluster_converter.go
@@ -857,7 +857,7 @@ func getFlinkProperties(properties map[string]string) string {
 	return builder.String()
 }
 
-var jobManagerIngressHostRegex = regexp.MustCompile("{{\\s*[$]clusterName\\s*}}")
+var jobManagerIngressHostRegex = regexp.MustCompile(`{{\s*[$]clusterName\s*}}`)
 
 func getJobManagerIngressHost(ingressHostFormat string, clusterName string) string {
 	// TODO: Validating webhook should verify hostFormat

diff --git a/controllers/flinkcluster_util.go b/controllers/flinkcluster_util.go
@@ -84,8 +84,8 @@ func getFlinkAPIBaseURL(cluster *v1beta1.FlinkCluster) string {
 
 	return fmt.Sprintf(
 		"http://%s.%s.svc.%s:%d",
-		getJobManagerServiceName(cluster.ObjectMeta.Name),
-		cluster.ObjectMeta.Namespace,
+		getJobManagerServiceName(cluster.Name),
+		cluster.Namespace,
 		clusterDomain,
 		*cluster.Spec.JobManager.Ports.UI)
 }
@@ -202,18 +202,18 @@ func newRevision(cluster *v1beta1.FlinkCluster, revision int64, collisionCount *
 	}
 	cr, err := history.NewControllerRevision(cluster,
 		controllerKind,
-		cluster.ObjectMeta.Labels,
+		cluster.Labels,
 		runtime.RawExtension{Raw: patch},
 		revision,
 		collisionCount)
 	if err != nil {
 		return nil, err
 	}
-	if cr.ObjectMeta.Annotations == nil {
-		cr.ObjectMeta.Annotations = make(map[string]string)
+	if cr.Annotations == nil {
+		cr.Annotations = make(map[string]string)
 	}
 	for key, value := range cluster.Annotations {
-		cr.ObjectMeta.Annotations[key] = value
+		cr.Annotations[key] = value
 	}
 	cr.SetNamespace(cluster.GetNamespace())
 	cr.GetLabels()[history.ControllerRevisionManagedByLabel] = cluster.GetName()
@@ -572,7 +572,7 @@ func getPodLogs(clientset *kubernetes.Clientset, pod *corev1.Pod) (string, error
 	req := pods.GetLogs(pod.Name, &corev1.PodLogOptions{})
 	podLogs, err := req.Stream(context.TODO())
 	if err != nil {
-		return "", fmt.Errorf("Failed to get logs for pod %s: %v", pod.Name, err)
+		return "", fmt.Errorf("failed to get logs for pod %s: %v", pod.Name, err)
 	}
 	defer podLogs.Close()