From bd5784e68fff03bcd1a1bdaaf6823bee3a02d3e6 Mon Sep 17 00:00:00 2001
From: Tsuzu <8574909+tsuzu@users.noreply.github.com>
Date: Mon, 13 Mar 2023 23:21:32 +0900
Subject: [PATCH 1/2] Fix bugs

---
 tetrad/controllers/peernodesync_controller.go | 2 +-
 tetrad/controllers/peerssync_controller.go    | 2 +-
 tetrad/main.go                                | 2 +-
 tetrad/pkg/cniserver/cniserver.go             | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tetrad/controllers/peernodesync_controller.go b/tetrad/controllers/peernodesync_controller.go
index 6e27d6ca7..81e700408 100644
--- 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
index 321732fe5..cd33442ee 100644
--- 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
index ad17676c2..4f0ccb17d 100644
--- 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
index 454f7d5d0..eb2ddc228 100644
--- 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()

From 17887245a0a10d45522499262569ff1086244188 Mon Sep 17 00:00:00 2001
From: Tsuzu <8574909+tsuzu@users.noreply.github.com>
Date: Mon, 13 Mar 2023 23:26:29 +0900
Subject: [PATCH 2/2] Fix

---
 tetrad/pkg/labels/labels.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tetrad/pkg/labels/labels.go b/tetrad/pkg/labels/labels.go
index bb18477d9..c981b0f14 100644
--- 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
 }