diff --git a/.evergreen.yml b/.evergreen.yml index 50720c0eb..83b7d71cb 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -35,7 +35,7 @@ functions: working_dir: mongodb-kubernetes-operator/scripts/ci command: go run download.go env: - URL: https://github.com/operator-framework/operator-sdk/releases/download/v0.15.1/operator-sdk-v0.15.1-x86_64-linux-gnu + URL: https://github.com/operator-framework/operator-sdk/releases/download/v0.18.2/operator-sdk-v0.18.2-x86_64-linux-gnu FILENAME: operator-sdk DIR: ${workdir}/bin diff --git a/scripts/dev/dockerfile_generator.py b/scripts/dev/dockerfile_generator.py index ef6860f48..5c62aa7e2 100755 --- a/scripts/dev/dockerfile_generator.py +++ b/scripts/dev/dockerfile_generator.py @@ -6,11 +6,13 @@ DockerParameters = Dict[str, Union[bool, str, List[str]]] +GOLANG_TAG = "1.14" + def operator_params(files_to_add: List[str]) -> DockerParameters: return { "builder": True, - "builder_image": "golang", + "builder_image": f"golang:{GOLANG_TAG}", "base_image": "registry.access.redhat.com/ubi8/ubi-minimal:latest", "files_to_add": files_to_add, } @@ -19,7 +21,7 @@ def operator_params(files_to_add: List[str]) -> DockerParameters: def test_runner_params(files_to_add: List[str],) -> DockerParameters: return { "builder": True, - "builder_image": "golang", # TODO: make this image smaller. There were errors using alpine + "builder_image": f"golang:{GOLANG_TAG}", # TODO: make this image smaller. There were errors using alpine "base_image": "registry.access.redhat.com/ubi8/ubi-minimal:latest", "files_to_add": files_to_add, } @@ -27,14 +29,14 @@ def test_runner_params(files_to_add: List[str],) -> DockerParameters: def e2e_params(files_to_add: List[str]) -> DockerParameters: return { - "base_image": "golang", # TODO: make this image smaller, error: 'exec: "gcc": executable file not found in $PATH' with golang:alpine + "base_image": f"golang:{GOLANG_TAG}", # TODO: make this image smaller, error: 'exec: "gcc": executable file not found in $PATH' with golang:alpine "files_to_add": files_to_add, } def unit_test_params(files_to_add: List[str]) -> DockerParameters: return { - "base_image": "golang", + "base_image": f"golang:{GOLANG_TAG}", "files_to_add": files_to_add, } diff --git a/scripts/dev/templates/Dockerfile.template b/scripts/dev/templates/Dockerfile.template index 23f7287d0..00a379d7f 100644 --- a/scripts/dev/templates/Dockerfile.template +++ b/scripts/dev/templates/Dockerfile.template @@ -8,7 +8,7 @@ FROM {{base_image}} {% block packages -%} {% endblock -%} -ENV OPERATOR_SDK_VERSION v0.17.0 +ENV OPERATOR_SDK_VERSION v0.18.2 ENV GO111MODULE=on ENV GOPATH ""