[BEAM-8571] Release Go SDK containers, and use them. (apache#15365)

lostluck · web-flow · commit 0228419b3764 · 2021-08-23T11:13:48.000-07:00
* [BEAM-8571] Go SDK use released container
* [BEAM-9685] Release Go SDK containers.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -335,6 +335,7 @@ task("pushAllDockerImages") {
   dependsOn(":runners:spark:3:job-server:container:dockerPush")
   dependsOn(":sdks:java:container:pushAll")
   dependsOn(":sdks:python:container:pushAll")
+  dependsOn(":sdks:go:container:pushAll")
   for (version in project.ext.get("allFlinkVersions") as Array<*>) {
     dependsOn(":runners:flink:${version}:job-server-container:dockerPush")
   }
diff --git a/sdks/go/container/build.gradle b/sdks/go/container/build.gradle
@@ -76,3 +76,7 @@ if (project.rootProject.hasProperty(["docker-pull-licenses"])) {
   }
   dockerPrepare.dependsOn 'skipPullLicenses'
 }
+
+task pushAll {
+  dependsOn ":sdks:go:container:dockerPush"
+}
diff --git a/sdks/go/pkg/beam/options/jobopts/options.go b/sdks/go/pkg/beam/options/jobopts/options.go
@@ -27,6 +27,7 @@ import (
 
 	"sync/atomic"
 
+	"github.com/apache/beam/sdks/v2/go/pkg/beam/core"
 	"github.com/apache/beam/sdks/v2/go/pkg/beam/internal/errors"
 	"github.com/apache/beam/sdks/v2/go/pkg/beam/log"
 )
@@ -141,7 +142,7 @@ func IsLoopback() bool {
 // Convenience function.
 func GetEnvironmentConfig(ctx context.Context) string {
 	if *EnvironmentConfig == "" {
-		*EnvironmentConfig = os.ExpandEnv("apache/beam_go_sdk:latest")
+		*EnvironmentConfig = os.ExpandEnv("apache/beam_go_sdk:" + core.SdkVersion)
 		log.Infof(ctx, "No environment config specified. Using default config: '%v'", *EnvironmentConfig)
 	}
 	return *EnvironmentConfig

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,7 @@ task("pushAllDockerImages") {`
`335`	`335`	`dependsOn(":runners:spark:3:job-server:container:dockerPush")`
`336`	`336`	`dependsOn(":sdks:java:container:pushAll")`
`337`	`337`	`dependsOn(":sdks:python:container:pushAll")`
	`338`	`+ dependsOn(":sdks:go:container:pushAll")`
`338`	`339`	`for (version in project.ext.get("allFlinkVersions") as Array<*>) {`
`339`	`340`	`dependsOn(":runners:flink:${version}:job-server-container:dockerPush")`
`340`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,3 +76,7 @@ if (project.rootProject.hasProperty(["docker-pull-licenses"])) {`
`76`	`76`	`}`
`77`	`77`	`dockerPrepare.dependsOn 'skipPullLicenses'`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+task pushAll {`
	`81`	`+ dependsOn ":sdks:go:container:dockerPush"`
	`82`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import (`
`27`	`27`
`28`	`28`	`"sync/atomic"`
`29`	`29`
	`30`	`+ "github.com/apache/beam/sdks/v2/go/pkg/beam/core"`
`30`	`31`	`"github.com/apache/beam/sdks/v2/go/pkg/beam/internal/errors"`
`31`	`32`	`"github.com/apache/beam/sdks/v2/go/pkg/beam/log"`
`32`	`33`	`)`
`@@ -141,7 +142,7 @@ func IsLoopback() bool {`
`141`	`142`	`// Convenience function.`
`142`	`143`	`func GetEnvironmentConfig(ctx context.Context) string {`
`143`	`144`	`if *EnvironmentConfig == "" {`
`144`		`- *EnvironmentConfig = os.ExpandEnv("apache/beam_go_sdk:latest")`
	`145`	`+ *EnvironmentConfig = os.ExpandEnv("apache/beam_go_sdk:" + core.SdkVersion)`
`145`	`146`	`log.Infof(ctx, "No environment config specified. Using default config: '%v'", *EnvironmentConfig)`
`146`	`147`	`}`
`147`	`148`	`return *EnvironmentConfig`