Merge pull request #17 from vinted/feature/add_9fe7fd3_release_support

Feature/add 9fe7fd3 release support
vinted · May 13, 2020 · 4c7c7d5 · 4c7c7d5
2 parents 36b18e8 + 56f8b60
commit 4c7c7d5
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 108 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,3 +30,8 @@ Initial release.
 # 4.2.0
 
 - [CHANGE] Fix incompatible command arguments for artifacts  (2020-02-19) release
+
+# 4.3.0
+
+- [CHANGE] Added support for 9fe7fd3 (2020-05-20) release
+- [CHANGE] Some deprecated flags are removed
diff --git a/Gemfile b/Gemfile
@@ -14,6 +14,6 @@ end
 
 group :kitchen_common do
   gem 'kitchen-docker'
-  gem 'kitchen-inspec'
+  gem 'kitchen-inspec', '<= 1.3.1'
   gem 'test-kitchen'
 end
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -8,13 +8,19 @@
 # the topology implementation to use
 default['vitess']['topo_implementation'] = 'etcd2'
 
-default['vitess']['version']['mysqlctld'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtctlclient'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtctld'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtgate'] = 'v4.0.1-041757f'
-default['vitess']['version']['vttablet'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtworker'] = 'v4.0.1-041757f'
-default['vitess']['version']['mysqlctl'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtctl'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtexplain'] = 'v4.0.1-041757f'
-default['vitess']['version']['vtbench'] = 'v4.0.1-041757f'
+default['vitess']['version']['mysqlctld'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtctlclient'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtctld'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtgate'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vttablet'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtworker'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['mysqlctl'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtctl'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtexplain'] = 'v6.0-9fe7fd3'
+default['vitess']['version']['vtbench'] = 'v6.0-9fe7fd3'
+
+# host to send spans to. if empty, no tracing will be done
+default['vitess']['datadog-agent-host'] = nil
+
+# port to send spans to. if empty, no tracing will be done
+default['vitess']['datadog-agent-port'] = nil
diff --git a/attributes/mysqlctld.rb b/attributes/mysqlctld.rb
@@ -158,12 +158,12 @@
 default['vitess']['mysqlctld']['grpc_initial_window_size'] = nil
 
 # After a duration of this time if the client doesn't see any activity it pings the server to see if
-# the transport is still alive
-default['vitess']['mysqlctld']['grpc_keepalive_time'] = nil
+# the transport is still alive. (default 10s)
+default['vitess']['mysqlctld']['grpc_keepalive_time'] = '10s'
 
 # After having pinged for keepalive check, the client waits for a duration of Timeout and if no
-# activity is seen even after that the connection is closed
-default['vitess']['mysqlctld']['grpc_keepalive_timeout'] = nil
+# activity is seen even after that the connection is closed. (default 10s)
+default['vitess']['mysqlctld']['grpc_keepalive_timeout'] = '10s'
 
 # key to use, requires grpc_cert, enables TLS
 default['vitess']['mysqlctld']['grpc_key'] = nil
@@ -212,9 +212,6 @@
 # keep running at least this long after SIGTERM before stopping (default 50ms)
 default['vitess']['mysqlctld']['lameduck-period'] = '50ms'
 
-# deprecated: timeout for acquiring topology locks, use remote_operation_timeout (default 30s)
-default['vitess']['mysqlctld']['lock_timeout'] = '30s'
-
 # when logging hits line file:N, emit a stack trace
 default['vitess']['mysqlctld']['log_backtrace_at'] = nil
 
@@ -304,6 +301,12 @@
 # The name of the registered push-based monitoring/stats backend to use
 default['vitess']['mysqlctld']['stats_backend'] = nil
 
+# List of dimensions to be combined into a single "all" value in exported stats vars
+default['vitess']['mysqlctld']['stats_combine_dimensions'] = nil
+
+# Variables to be dropped from the list of exported variables.
+default['vitess']['mysqlctld']['stats_drop_variables'] = nil
+
 # Interval between emitting stats to all registered backends (default 1m0s)
 default['vitess']['mysqlctld']['stats_emit_period'] = '1m0s'
 

diff --git a/attributes/releases.rb b/attributes/releases.rb
@@ -1,4 +1,4 @@
-default['vitess']['releases']['041757f']['url'] =
-  'https://github.com/planetscale/vitess-releases/releases/download/041757f/vitess-4.0.1-041757f.tar.gz'
-default['vitess']['releases']['041757f']['checksum'] =
-  '29948027a3c40aafb2f8ad298634be8b640b88538034708b904925bba62788a7'
+default['vitess']['releases']['9fe7fd3']['url'] =
+  'https://github.com/planetscale/vitess-releases/releases/download/9fe7fd3/vitess-6.0-9fe7fd3.tar.gz'
+default['vitess']['releases']['9fe7fd3']['checksum'] =
+  'c69fba47b364b4eea75b0bff478777764b627dbcd836f723397f306673fe269b'
diff --git a/attributes/vtctld.rb b/attributes/vtctld.rb
@@ -87,9 +87,6 @@
 # Google Cloud Storage bucket to use for backups
 default['vitess']['vtctld']['gcs_backup_storage_bucket'] = nil
 
-# This flag is unused and deprecated. It will be removed entirely in a future release
-default['vitess']['vtctld']['gcs_backup_storage_project'] = nil
-
 # root prefix for all backup-related object names
 default['vitess']['vtctld']['gcs_backup_storage_root'] = nil
 
@@ -122,12 +119,12 @@
 default['vitess']['vtctld']['grpc_initial_window_size'] = nil
 
 # After a duration of this time if the client doesn't see any activity it pings the server to see if
-# the transport is still alive
-default['vitess']['vtctld']['grpc_keepalive_time'] = nil
+# the transport is still alive. (default 10s)
+default['vitess']['vtctld']['grpc_keepalive_time'] = '10s'
 
 # After having pinged for keepalive check, the client waits for a duration of Timeout and if no
-# activity is seen even after that the connection is closed
-default['vitess']['vtctld']['grpc_keepalive_timeout'] = nil
+# activity is seen even after that the connection is closed. (default 10s)
+default['vitess']['vtctld']['grpc_keepalive_timeout'] = '10s'
 
 # key to use, requires grpc_cert, enables TLS
 default['vitess']['vtctld']['grpc_key'] = nil
@@ -176,9 +173,6 @@
 # use the legacy algorithm when selecting the vttablets for serving (default true)
 default['vitess']['vtctld']['legacy_replication_lag_algorithm'] = true
 
-# deprecated: timeout for acquiring topology locks, use remote_operation_timeout (default 30s)
-default['vitess']['vtctld']['lock_timeout'] = '30s'
-
 # when logging hits line file:N, emit a stack trace
 default['vitess']['vtctld']['log_backtrace_at'] = nil
 
@@ -244,6 +238,9 @@
 # port for the server
 default['vitess']['vtctld']['port'] = 15_000
 
+# Setting this true will make vtctld proxy the tablet status instead of redirecting to them
+default['vitess']['vtctld']['proxy_tablets'] = nil
+
 # how often try to remove old logs (default 1h0m0s)
 default['vitess']['vtctld']['purge_logs_interval'] = '1h0m0s'
 
@@ -329,6 +326,12 @@
 # The name of the registered push-based monitoring/stats backend to use
 default['vitess']['vtctld']['stats_backend'] = nil
 
+# List of dimensions to be combined into a single "all" value in exported stats vars
+default['vitess']['vtctld']['stats_combine_dimensions'] = nil
+
+# Variables to be dropped from the list of exported variables.
+default['vitess']['vtctld']['stats_drop_variables'] = nil
+
 # Interval between emitting stats to all registered backends (default 1m0s)
 default['vitess']['vtctld']['stats_emit_period'] = '1m0s'
 

diff --git a/attributes/vtgate.rb b/attributes/vtgate.rb
@@ -40,9 +40,6 @@
 # The default tablet type to set for queries, when one is not explicitly selected (default MASTER)
 default['vitess']['vtgate']['default_tablet_type'] = 'MASTER'
 
-# if specified, this process will not route any queries to local tablets in the local cell
-default['vitess']['vtgate']['disable_local_gateway'] = nil
-
 # the replication lag that is considered too high when selecting the minimum num vttablets for
 # serving (default 2h0m0s)
 default['vitess']['vtgate']['discovery_high_replication_lag_minimum_serving'] = '2h0m0s'
@@ -100,12 +97,12 @@
 default['vitess']['vtgate']['grpc_initial_window_size'] = nil
 
 # After a duration of this time if the client doesn't see any activity it pings the server to see if
-# the transport is still alive
-default['vitess']['vtgate']['grpc_keepalive_time'] = nil
+# the transport is still alive. (default 10s)
+default['vitess']['vtgate']['grpc_keepalive_time'] = '10s'
 
 # After having pinged for keepalive check, the client waits for a duration of Timeout and if no
-# activity is seen even after that the connection is closed
-default['vitess']['vtgate']['grpc_keepalive_timeout'] = nil
+# activity is seen even after that the connection is closed. (default 10s)
+default['vitess']['vtgate']['grpc_keepalive_timeout'] = '10s'
 
 # key to use, requires grpc_cert, enables TLS
 default['vitess']['vtgate']['grpc_key'] = nil
@@ -168,9 +165,6 @@
 # use the legacy algorithm when selecting the vttablets for serving (default true)
 default['vitess']['vtgate']['legacy_replication_lag_algorithm'] = true
 
-# deprecated: timeout for acquiring topology locks, use remote_operation_timeout (default 30s)
-default['vitess']['vtgate']['lock_timeout'] = '30s'
-
 # when logging hits line file:N, emit a stack trace
 default['vitess']['vtgate']['log_backtrace_at'] = nil
 
@@ -226,6 +220,9 @@
 # "mysql_clear_password")
 default['vitess']['vtgate']['mysql_clientcert_auth_method'] = 'mysql_clear_password'
 
+# Default session workload (OLTP, OLAP, DBA) (default "UNSPECIFIED")
+default['vitess']['vtgate']['mysql_default_workload'] = 'UNSPECIFIED'
+
 # JSON File from which to read LDAP server config
 default['vitess']['vtgate']['mysql_ldap_auth_config_file'] = nil
 
@@ -243,6 +240,9 @@
 # If set, also listen for MySQL binary protocol connections on this port. (default -1)
 default['vitess']['vtgate']['mysql_server_port'] = 15_306
 
+# Delay after which buffered response will flushed to client. (default 100ms)
+default['vitess']['vtgate']['mysql_server_flush_delay'] = '100ms'
+
 # mysql query timeout
 default['vitess']['vtgate']['mysql_server_query_timeout'] = nil
 
@@ -294,6 +294,9 @@
 # port for the server
 default['vitess']['vtgate']['port'] = 15_001
 
+# Enable HAProxy PROXY protocol on MySQL listener socket
+default['vitess']['vtgate']['proxy_protocol'] = nil
+
 # how often try to remove old logs (default 1h0m0s)
 default['vitess']['vtgate']['purge_logs_interval'] = '1h0m0s'
 
@@ -334,6 +337,12 @@
 # The name of the registered push-based monitoring/stats backend to use
 default['vitess']['vtgate']['stats_backend'] = nil
 
+# List of dimensions to be combined into a single "all" value in exported stats vars
+default['vitess']['vtgate']['stats_combine_dimensions'] = nil
+
+# Variables to be dropped from the list of exported variables.
+default['vitess']['vtgate']['stats_drop_variables'] = nil
+
 # Interval between emitting stats to all registered backends (default 1m0s)
 default['vitess']['vtgate']['stats_emit_period'] = '1m0s'