Merge 9a606b9 into e787bc7

flyteorg · Jul 12, 2021 · 1ed400d · 1ed400d
2 parents e787bc7 + 9a606b9
commit 1ed400d
Show file tree

Hide file tree

Showing 35 changed files with 232 additions and 1,683 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/athena v1.0.0
 	github.com/coocood/freecache v1.1.1
 	github.com/flyteorg/flyteidl v0.19.2
-	github.com/flyteorg/flytestdlib v0.3.13
+	github.com/flyteorg/flytestdlib v0.3.22
 	github.com/go-logr/zapr v0.4.0 // indirect
 	github.com/go-test/deep v1.0.7
 	github.com/golang/protobuf v1.4.3

diff --git a/go.sum b/go.sum
diff --git a/go/tasks/aws/config_flags.go b/go/tasks/aws/config_flags.go
diff --git a/go/tasks/aws/config_flags_test.go b/go/tasks/aws/config_flags_test.go
diff --git a/go/tasks/config/config_flags.go b/go/tasks/config/config_flags.go
diff --git a/go/tasks/config/config_flags_test.go b/go/tasks/config/config_flags_test.go
diff --git a/go/tasks/config_load_test.go b/go/tasks/config_load_test.go
@@ -37,7 +37,6 @@ func TestLoadConfig(t *testing.T) {
 		assert.Equal(t, map[string]string{
 			"annotationKey1": "annotationValue1",
 			"annotationKey2": "annotationValue2",
-			"cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
 		}, k8sConfig.DefaultAnnotations)
 		assert.Equal(t, map[string]string{
 			"label1": "labelValue1",

diff --git a/go/tasks/logs/logconfig_flags.go b/go/tasks/logs/logconfig_flags.go
diff --git a/go/tasks/logs/logconfig_flags_test.go b/go/tasks/logs/logconfig_flags_test.go
diff --git a/go/tasks/pluginmachinery/catalog/config_flags.go b/go/tasks/pluginmachinery/catalog/config_flags.go