Merge pull request #1158 from mikebrow/cni-debug-update

adds cni config data to the cri status/info
containerd · Jun 7, 2019 · 770621f · 770621f
2 parents 0a89a04 + b87c0d7
commit 770621f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/server/status.go b/pkg/server/status.go
@@ -72,6 +72,12 @@ func (c *criService) Status(ctx context.Context, r *runtime.StatusRequest) (*run
 			return nil, err
 		}
 		resp.Info["golang"] = string(versionByt)
+
+		cniConfig, err := json.Marshal(c.netPlugin.GetConfig())
+		if err != nil {
+			logrus.WithError(err).Errorf("Failed to marshal CNI config %v", err)
+		}
+		resp.Info["cniconfig"] = string(cniConfig)
 	}
 	return resp, nil
 }
diff --git a/pkg/store/sandbox/metadata.go b/pkg/store/sandbox/metadata.go
@@ -57,7 +57,7 @@ type Metadata struct {
 	IP string
 	// RuntimeHandler is the runtime handler name of the pod.
 	RuntimeHandler string
-	// CNI result
+	// CNIresult resulting configuration for attached network namespace interfaces
 	CNIResult *cni.CNIResult
 }