feat(kuma-dp): Kuma DP + Envoy version in Dataplane Insights (#1112)

api/mesh/v1alpha1/dataplane_insight.proto

@@ -57,6 +57,9 @@ message DiscoverySubscription {
   // Status of the ADS subscription.
   DiscoverySubscriptionStatus status = 5
       [ (validate.rules).message.required = true ];
+
+  // Version of Envoy and Kuma dataplane
+  Version version = 6;
 }
 
 // DiscoverySubscriptionStatus defines status of an ADS subscription.
@@ -93,3 +96,39 @@ message DiscoveryServiceStats {
   // Number of xDS responses NACKed by the Dataplane.
   uint64 responses_rejected = 3;
 }
+
+// Version defines version of Kuma Dataplane and Envoy
+message Version {
+
+  // Version of Kuma Dataplane
+  KumaDpVersion dpVersion = 1;
+
+  // Version of Envoy
+  EnvoyVersion envoy = 2;
+}
+
+// KumaDpVersion describes details of Kuma Dataplane version
+message KumaDpVersion {
+
+  // Version number of Kuma Dataplane
+  string version = 1;
+
+  // Git tag of Kuma Dataplane version
+  string gitTag = 2;
+
+  // Git commit of Kuma Dataplane version
+  string gitCommit = 3;
+
+  // Build date of Kuma Dataplane version
+  string buildDate = 4;
+}
+
+// EnvoyVersion describes details of Envoy version
+message EnvoyVersion {
+
+  // Version number of Envoy
+  string version = 1;
+
+  // Full build tag of Envoy version
+  string build = 2;
+}

api/mesh/v1alpha1/dataplane_insight_helpers.go

@@ -17,6 +17,21 @@ func NewSubscriptionStatus() *DiscoverySubscriptionStatus {
 	}
 }
 
+func NewVersion() *Version {
+	return &Version{
+		DpVersion: &KumaDpVersion{
+			Version:   "",
+			GitTag:    "",
+			GitCommit: "",
+			BuildDate: "",
+		},
+		Envoy: &EnvoyVersion{
+			Version: "",
+			Build:   "",
+		},
+	}
+}
+
 func (ds *DataplaneInsight) IsOnline() bool {
 	for _, s := range ds.GetSubscriptions() {
 		if s.ConnectTime != nil && s.DisconnectTime == nil {

app/kuma-dp/cmd/run_test.go

@@ -36,7 +36,7 @@ var _ = Describe("run", func() {
 	BeforeEach(func() {
 		backupSetupSignalHandler = core.SetupSignalHandler
 		backupBootstrapGenerator = bootstrapGenerator
-		bootstrapGenerator = func(_ string, cfg kumadp.Config, _ *rest.Resource) (proto.Message, error) {
+		bootstrapGenerator = func(_ string, cfg kumadp.Config, _ *rest.Resource, version envoy.EnvoyVersion) (proto.Message, error) {
 			bootstrap := envoy_bootstrap.Bootstrap{}
 			respBytes, err := ioutil.ReadFile(filepath.Join("testdata", "bootstrap-config.golden.yaml"))
 			Expect(err).ToNot(HaveOccurred())
@@ -152,13 +152,14 @@ var _ = Describe("run", func() {
 			Expect(err).ToNot(HaveOccurred())
 			// and
 			actualArgs := strings.Split(string(cmdline), "\n")
-			Expect(actualArgs[0]).To(Equal("-c"))
-			actualConfigFile := actualArgs[1]
+			Expect(actualArgs[0]).To(Equal("--version"))
+			Expect(actualArgs[1]).To(Equal("-c"))
+			actualConfigFile := actualArgs[2]
 			Expect(actualConfigFile).To(BeARegularFile())
 
 			// then
 			if given.expectedFile != "" {
-				Expect(actualArgs[1]).To(Equal(given.expectedFile))
+				Expect(actualArgs[2]).To(Equal(given.expectedFile))
 			}
 
 			// when