Merge pull request #62 from miscord-dev/fix-bugs

Fix bugs
miscord-dev · Mar 13, 2023 · eb0f67a · eb0f67a
2 parents 71f2aca + 1788724
commit eb0f67a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/tetrad/controllers/peernodesync_controller.go b/tetrad/controllers/peernodesync_controller.go
@@ -111,7 +111,7 @@ func (r *PeerNodeSyncReconciler) labels() map[string]string {
 }
 
 func (r *PeerNodeSyncReconciler) addrsLabels() map[string]string {
-	return labels.NodeTypeForNode(r.ClusterName, r.NodeName)
+	return labels.NodeTypeForNode(r.ClusterName, r.NodeName, "")
 }
 
 func peerNodeName(clusterName, nodeName string) string {

diff --git a/tetrad/controllers/peerssync_controller.go b/tetrad/controllers/peerssync_controller.go
@@ -219,7 +219,7 @@ func (r *PeersSyncReconciler) labels() map[string]string {
 }
 
 func (r *PeersSyncReconciler) addressLabels() map[string]string {
-	return tetrapodlabels.NodeTypeForNode(r.ClusterName, r.NodeName)
+	return tetrapodlabels.NodeTypeForNode(r.ClusterName, r.NodeName, "")
 }
 
 // SetupWithManager sets up the controller with the Manager.

diff --git a/tetrad/main.go b/tetrad/main.go
@@ -225,7 +225,7 @@ func main() {
 			return name[:53-9] + "-" + hex.EncodeToString(hash[:])[:8]
 		},
 		Labels: func(templateName string) map[string]string {
-			return labels.NodeTypeForNode(config.ClusterName, config.NodeName)
+			return labels.NodeTypeForNode(config.ClusterName, config.NodeName, templateName)
 		},
 	}).SetupWithManager(mgr, "NodeAddressSync"); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "CIDRClaimer")

diff --git a/tetrad/pkg/cniserver/cniserver.go b/tetrad/pkg/cniserver/cniserver.go
@@ -170,6 +170,10 @@ type GetExtraPodCIDRsArgs struct {
 }
 
 func (h *Handler) GetExtraPodCIDRs(args *GetExtraPodCIDRsArgs, cidrClaims *controlplanev1alpha1.CIDRClaimList) error {
+	if h.localCache == nil {
+		return nil
+	}
+
 	fn := func() error {
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer cancel()

diff --git a/tetrad/pkg/labels/labels.go b/tetrad/pkg/labels/labels.go
@@ -14,10 +14,13 @@ func ForNode(clusterName, nodeName string) map[string]string {
 	}
 }
 
-func NodeTypeForNode(clusterName, nodeName string) map[string]string {
+func NodeTypeForNode(clusterName, nodeName, templateName string) map[string]string {
 	labels := ForNode(clusterName, nodeName)
 
 	labels["client.miscord.win/type"] = "node"
+	if templateName != "" {
+		labels[TemplateNameLabelKey] = templateName
+	}
 
 	return labels
 }