pass in configurations from configmap

webmeshproj · Oct 2, 2023 · a3d085a · a3d085a
1 parent 8535395
commit a3d085a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 14 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -30,7 +30,7 @@ import (
 func main() {
 	// We run the entrypoint based on how we were invoked.
 	switch filepath.Base(os.Args[0]) {
-	case "webmesh":
+	case "webmesh", "loopback":
 		plugin.Main(version.Version)
 	case "webmesh-cni-node":
 		node.Main(version.Version)

diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -963,9 +963,8 @@ metadata:
   name: webmesh-config
   namespace: kube-system
 data:
-  ## TODO: Add the webmesh-cni-node configurations here as well to
-  ## potentially override command line arguments and other defaults.
-  #
+  cluster-domain: "cluster.local"
+  pod-cidr: "10.42.0.0/24"
   # The network config to install on each node.
   cni-network-config: |-
     {
@@ -1063,6 +1062,8 @@ spec:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
+            - mountPath: /var/lib/cni/networks
+              name: host-local-net-dir
           securityContext:
             privileged: true
       containers:
@@ -1084,6 +1085,18 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            # Set the pod cidr based on the one we are running.
+            - name: POD_CIDR
+              valueFrom:
+                configMapKeyRef:
+                  name: webmesh-config
+                  key: pod-cidr
+            # Set the cluster domain based on the one we are running.
+            - name: CLUSTER_DOMAIN
+              valueFrom:
+                configMapKeyRef:
+                  name: webmesh-config
+                  key: cluster-domain
           volumeMounts:
             - mountPath: /lib/modules
               name: lib-modules
@@ -1103,3 +1116,9 @@ spec:
         - name: cni-net-dir
           hostPath:
             path: /etc/cni/net.d
+        # Mount in the directory for host-local IPAM allocations. This is
+        # used when upgrading from host-local to calico-ipam, and can be removed
+        # if not using the upgrade-ipam init container.
+        - name: host-local-net-dir
+          hostPath:
+            path: /var/lib/cni/networks
diff --git a/deploy/cni/cni.yaml b/deploy/cni/cni.yaml
@@ -6,9 +6,8 @@ metadata:
   name: webmesh-config
   namespace: kube-system
 data:
-  ## TODO: Add the webmesh-cni-node configurations here as well to
-  ## potentially override command line arguments and other defaults.
-  #
+  cluster-domain: "cluster.local"
+  pod-cidr: "10.42.0.0/24"
   # The network config to install on each node.
   cni-network-config: |-
     {
@@ -129,6 +128,18 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            # Set the pod cidr based on the one we are running.
+            - name: POD_CIDR
+              valueFrom:
+                configMapKeyRef:
+                  name: webmesh-config
+                  key: pod-cidr
+            # Set the cluster domain based on the one we are running.
+            - name: CLUSTER_DOMAIN
+              valueFrom:
+                configMapKeyRef:
+                  name: webmesh-config
+                  key: cluster-domain
           volumeMounts:
             - mountPath: /lib/modules
               name: lib-modules

diff --git a/internal/cmd/install/install.go b/internal/cmd/install/install.go
@@ -80,11 +80,13 @@ func Main(version string) {
 		os.Exit(1)
 	}
 	// Copy the binary to the destination directory.
-	pluginBin := filepath.Join(os.Getenv(BinaryDestBinEnvVar), PluginBinaryName)
-	log.Println("installing plugin binary to -> ", pluginBin)
-	if err := installPluginBinary(exec, pluginBin); err != nil {
-		log.Println("error copying binary:", err)
-		os.Exit(1)
+	for _, binName := range []string{PluginBinaryName, "loopback"} {
+		pluginBin := filepath.Join(os.Getenv(BinaryDestBinEnvVar), binName)
+		log.Println("installing plugin binary to -> ", pluginBin)
+		if err := installPluginBinary(exec, pluginBin); err != nil {
+			log.Println("error copying binary:", err)
+			os.Exit(1)
+		}
 	}
 	// Write a kubeconfig file to the destination directory.
 	kubeconfigPath := filepath.Join(os.Getenv(BinaryDestBinEnvVar), "webmesh-kubeconfig")

diff --git a/internal/cmd/node/node.go b/internal/cmd/node/node.go
@@ -67,8 +67,8 @@ func Main(version string) {
 	)
 	flag.StringVar(&namespace, "namespace", os.Getenv(install.PodNamespaceEnvVar), "The namespace to use for the webmesh resources.")
 	flag.StringVar(&nodeID, "node-id", os.Getenv(install.NodeNameEnvVar), "The node ID to use for the webmesh cluster.")
-	flag.StringVar(&podCIDR, "pod-cidr", "172.16.0.0/12", "The pod CIDR to use for the webmesh cluster.")
-	flag.StringVar(&clusterDomain, "cluster-domain", "cluster.local", "The cluster domain to use for the webmesh cluster.")
+	flag.StringVar(&podCIDR, "pod-cidr", os.Getenv("POD_CIDR"), "The pod CIDR to use for the webmesh cluster.")
+	flag.StringVar(&clusterDomain, "cluster-domain", os.Getenv("CLUSTER_DOMAIN"), "The cluster domain to use for the webmesh cluster.")
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.DurationVar(&leaderElectLeaseDuration, "leader-elect-lease-duration", time.Second*15, "The duration that non-leader candidates will wait to force acquire leadership.")