1 files changed, 25 insertions, 3 deletions
diff --git a/grpc/tools/interop_matrix/client_matrix.py b/grpc/tools/interop_matrix/client_matrix.py
index 16e1ebdd..5cd532e6 100644
--- a/grpc/tools/interop_matrix/client_matrix.py
+++ b/grpc/tools/interop_matrix/client_matrix.py
@@ -54,7 +54,7 @@ def should_build_docker_interop_image_from_release_tag(lang):
 # Dictionary of default runtimes per language
 LANG_RUNTIME_MATRIX = {
     'cxx': ['cxx'],  # This is actually debian8.
-    'go': ['go1.8', 'go1.11'],
+    'go': ['go1.8', 'go1.11', 'go1.16'],
     'java': ['java'],
     'python': ['python', 'pythonasyncio'],
     'node': ['node'],
@@ -110,6 +110,9 @@ LANG_RELEASE_MATRIX = {
             ('v1.32.0', ReleaseInfo()),
             ('v1.33.2', ReleaseInfo()),
             ('v1.34.0', ReleaseInfo()),
+            ('v1.35.0', ReleaseInfo()),
+            ('v1.36.3', ReleaseInfo()),
+            ('v1.37.0', ReleaseInfo()),
         ]),
     'go':
         OrderedDict([
@@ -180,6 +183,10 @@ LANG_RELEASE_MATRIX = {
             ('v1.33.1',
              ReleaseInfo(runtimes=['go1.11'], testcases_file='go__v1.20.0')),
             ('v1.34.0', ReleaseInfo(runtimes=['go1.11'])),
+            ('v1.35.0', ReleaseInfo(runtimes=['go1.11'])),
+            ('v1.36.0', ReleaseInfo(runtimes=['go1.11'])),
+            ('v1.37.0', ReleaseInfo(runtimes=['go1.11'])),
+            # NOTE: starting from release v1.38.0, use runtimes=['go1.16']
         ]),
     'java':
         OrderedDict([
@@ -244,10 +251,13 @@ LANG_RELEASE_MATRIX = {
             ('v1.28.1', ReleaseInfo()),
             ('v1.29.0', ReleaseInfo()),
             ('v1.30.2', ReleaseInfo()),
-            ('v1.31.1', ReleaseInfo()),
-            ('v1.32.2', ReleaseInfo()),
+            ('v1.31.2', ReleaseInfo()),
+            ('v1.32.3', ReleaseInfo()),
             ('v1.33.1', ReleaseInfo()),
             ('v1.34.1', ReleaseInfo()),
+            ('v1.35.1', ReleaseInfo()),
+            ('v1.36.1', ReleaseInfo()),
+            ('v1.37.0', ReleaseInfo()),
         ]),
     'python':
         OrderedDict([
@@ -308,6 +318,9 @@ LANG_RELEASE_MATRIX = {
             ('v1.32.0', ReleaseInfo(runtimes=['python'])),
             ('v1.33.2', ReleaseInfo(runtimes=['python'])),
             ('v1.34.0', ReleaseInfo(runtimes=['python'])),
+            ('v1.35.0', ReleaseInfo(runtimes=['python'])),
+            ('v1.36.3', ReleaseInfo(runtimes=['python'])),
+            ('v1.37.0', ReleaseInfo(runtimes=['python'])),
         ]),
     'node':
         OrderedDict([
@@ -371,6 +384,9 @@ LANG_RELEASE_MATRIX = {
             ('v1.32.0', ReleaseInfo()),
             ('v1.33.2', ReleaseInfo()),
             ('v1.34.0', ReleaseInfo()),
+            ('v1.35.0', ReleaseInfo()),
+            ('v1.36.3', ReleaseInfo()),
+            ('v1.37.0', ReleaseInfo()),
         ]),
     'php':
         OrderedDict([
@@ -407,6 +423,9 @@ LANG_RELEASE_MATRIX = {
             ('v1.32.0', ReleaseInfo()),
             ('v1.33.2', ReleaseInfo()),
             ('v1.34.0', ReleaseInfo()),
+            ('v1.35.0', ReleaseInfo()),
+            ('v1.36.3', ReleaseInfo()),
+            ('v1.37.0', ReleaseInfo()),
         ]),
     'csharp':
         OrderedDict([
@@ -448,5 +467,8 @@ LANG_RELEASE_MATRIX = {
             ('v1.32.0', ReleaseInfo()),
             ('v1.33.2', ReleaseInfo()),
             ('v1.34.0', ReleaseInfo()),
+            ('v1.35.0', ReleaseInfo()),
+            ('v1.36.3', ReleaseInfo()),
+            ('v1.37.0', ReleaseInfo()),
         ]),
 }