Merged master

Signed-off-by: GuptaManan100 <[email protected]>
tinyspeck · Oct 7, 2020 · da1174b · da1174b
2 parents d63cd7d + 58f8fbb
commit da1174b
Show file tree

Hide file tree

Showing 63 changed files with 4,479 additions and 3,707 deletions.
diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ endif
 install: build
 	# binaries
 	mkdir -p "$${PREFIX}/bin"
-	cp "$${VTROOT}/bin/"{mysqlctld,orchestrator,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
+	cp "$${VTROOT}/bin/"{mysqlctld,vtorc,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
 
 # install copies the files needed to run test Vitess using vtcombo into the given directory tree.
 # Usage: make install PREFIX=/path/to/install/root

diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/base:${VT_BASE_VER} AS base
 

diff --git a/docker/k8s/mysqlctld/Dockerfile b/docker/k8s/mysqlctld/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/orchestrator/Dockerfile b/docker/k8s/orchestrator/Dockerfile
@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
-ARG ORC_VER
-
+ARG VT_BASE_VER=latest
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 
 FROM debian:buster-slim
+ARG ORC_VER='3.2.3'
 
 RUN apt-get update && \
    apt-get upgrade -qq && \

diff --git a/docker/k8s/pmm-client/Dockerfile b/docker/k8s/pmm-client/Dockerfile
@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
-ARG PMM_CLIENT_VER
-
+ARG VT_BASE_VER=latest
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 
 FROM debian:buster-slim
+ARG PMM_CLIENT_VER='1.17.4'
 
 RUN apt-get update && \
    apt-get upgrade -qq && \

diff --git a/docker/k8s/vtbackup/Dockerfile b/docker/k8s/vtbackup/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/vtctl/Dockerfile b/docker/k8s/vtctl/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/vtctlclient/Dockerfile b/docker/k8s/vtctlclient/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/vtctld/Dockerfile b/docker/k8s/vtctld/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/vtgate/Dockerfile b/docker/k8s/vtgate/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/vttablet/Dockerfile b/docker/k8s/vttablet/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/docker/k8s/vtworker/Dockerfile b/docker/k8s/vtworker/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG VT_BASE_VER
+ARG VT_BASE_VER=latest
 
 FROM vitess/k8s:${VT_BASE_VER} AS k8s
 

diff --git a/go/cmd/orchestrator/main.go → go/cmd/vtorc/main.go b/go/cmd/orchestrator/main.go → go/cmd/vtorc/main.go
diff --git a/go/cmd/orchestrator/plugin_consultopo.go → go/cmd/vtorc/plugin_consultopo.go b/go/cmd/orchestrator/plugin_consultopo.go → go/cmd/vtorc/plugin_consultopo.go
diff --git a/go/cmd/orchestrator/plugin_etcd2topo.go → go/cmd/vtorc/plugin_etcd2topo.go b/go/cmd/orchestrator/plugin_etcd2topo.go → go/cmd/vtorc/plugin_etcd2topo.go
diff --git a/go/cmd/orchestrator/plugin_grpctmclient.go → go/cmd/vtorc/plugin_grpctmclient.go b/go/cmd/orchestrator/plugin_grpctmclient.go → go/cmd/vtorc/plugin_grpctmclient.go
diff --git a/go/cmd/orchestrator/plugin_kubernetestopo.go → go/cmd/vtorc/plugin_kubernetestopo.go b/go/cmd/orchestrator/plugin_kubernetestopo.go → go/cmd/vtorc/plugin_kubernetestopo.go
diff --git a/go/cmd/orchestrator/plugin_zk2topo.go → go/cmd/vtorc/plugin_zk2topo.go b/go/cmd/orchestrator/plugin_zk2topo.go → go/cmd/vtorc/plugin_zk2topo.go