From e3a46cb6ce83413c53d2abbe2cef9edb2a3be536 Mon Sep 17 00:00:00 2001
From: Jerome Brette <jbrette@gmail.com>
Date: Tue, 18 Jun 2019 18:04:21 -0500
Subject: [PATCH] Leverage new variables during testing

Extract the HTTP port (int) from the container section end
use it in the service definition.

Also enable variable replacement for Service object.
---
 pkg/target/variableref_test.go                    | 15 +++++++++++----
 .../config/defaultconfig/varreference.go          |  6 ++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkg/target/variableref_test.go b/pkg/target/variableref_test.go
index 18ec8b43c..79785c9b7 100644
--- a/pkg/target/variableref_test.go
+++ b/pkg/target/variableref_test.go
@@ -52,6 +52,13 @@ vars:
         apiVersion: apps/v1beta1
    fieldref:
         fieldpath: metadata.name
+ - name: CDB_HTTP_PORT
+   objref:
+        kind: StatefulSet
+        name: cockroachdb
+        apiVersion: apps/v1beta1
+   fieldref:
+        fieldpath: spec.template.spec.containers[0].ports[1].containerPort
  - name: CDB_STATEFULSET_SVC
    objref:
         kind: Service
@@ -108,8 +115,8 @@ spec:
   - port: 26257
     targetPort: 26257
     name: grpc
-  - port: 8080
-    targetPort: 8080
+  - port: $(CDB_HTTP_PORT)
+    targetPort: $(CDB_HTTP_PORT)
     name: http
   clusterIP: None
   selector:
@@ -131,8 +138,8 @@ spec:
     targetPort: 26257
     name: grpc
   # The secondary port serves the UI as well as health and debug endpoints.
-  - port: 8080
-    targetPort: 8080
+  - port: $(CDB_HTTP_PORT)
+    targetPort: $(CDB_HTTP_PORT)
     name: http
   selector:
     app: cockroachdb
diff --git a/pkg/transformers/config/defaultconfig/varreference.go b/pkg/transformers/config/defaultconfig/varreference.go
index e447309aa..c4d5cf19f 100644
--- a/pkg/transformers/config/defaultconfig/varreference.go
+++ b/pkg/transformers/config/defaultconfig/varreference.go
@@ -172,6 +172,12 @@ varReference:
 - path: spec/template/spec/initContainers/volumeMounts/mountPath
   kind: ReplicaSet
 
+- path: spec/ports/port
+  kind: Service
+
+- path: spec/ports/targetPort
+  kind: Service
+
 - path: spec/template/spec/containers/args
   kind: StatefulSet