Update required controller-gen to v0.6.1 (#135)

Issue #, if available: aws-controllers-k8s/community#873

Description of changes:
- Removes duplication of the `CONTROLLER_TOOLS_VERSION` variable
- Deletes the defunct `k8s.sh` script (not being used anywhere in this repo)

I have tested the new `controller-gen` against the `dynamodb` controller and saw no changes in output CRDs (except for the version number in an annotation). None of the breaking changes called out in the release between `0.4.0` and `0.6.1` should have any effect on our generator.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: RedbackThomson

scripts/build-controller-release.sh

@@ -11,7 +11,6 @@ BIN_DIR="$ROOT_DIR/bin"
 ACK_GENERATE_OLM=${ACK_GENERATE_OLM:-"false"}
 
 source "$SCRIPTS_DIR/lib/common.sh"
-source "$SCRIPTS_DIR/lib/k8s.sh"
 
 check_is_installed controller-gen "You can install controller-gen with the helper scripts/install-controller-gen.sh"
 check_is_installed helm "You can install Helm with the helper scripts/install-helm.sh"

scripts/build-controller.sh

@@ -9,7 +9,6 @@ ROOT_DIR="$SCRIPTS_DIR/.."
 BIN_DIR="$ROOT_DIR/bin"
 
 source "$SCRIPTS_DIR/lib/common.sh"
-source "$SCRIPTS_DIR/lib/k8s.sh"
 
 check_is_installed controller-gen "You can install controller-gen with the helper scripts/install-controller-gen.sh"
 

scripts/install-controller-gen.sh

@@ -19,12 +19,10 @@ set -eo pipefail
 
 SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 ROOT_DIR="$SCRIPTS_DIR/.."
-CONTROLLER_TOOLS_VERSION="v0.4.0"
 
 source "$SCRIPTS_DIR/lib/common.sh"
-source "$SCRIPTS_DIR/lib/k8s.sh"
 
-if ! is_installed controller-gen; then
+if ! is_installed controller-gen || ! k8s_controller_gen_version_equals "$CONTROLLER_TOOLS_VERSION"; then
     # GOBIN and GOPATH are not always set, so default to GOPATH from `go env`
     __GOPATH=$(go env GOPATH)
     __install_dir=${GOBIN:-$__GOPATH/bin}

scripts/lib/common.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+CONTROLLER_TOOLS_VERSION="v0.6.1"
+
 # setting the -x option if debugging is true
 if [[ "${DEBUG:-"false"}" = "true" ]]; then
     set -x
@@ -88,3 +90,22 @@ debug_msg() {
     fi
     echo "$__debug_prefix$__indent$__msg"
 }
+
+# controller_gen_version_equals accepts a string version and returns 0 if the
+# installed version of controller-gen matches the supplied version, otherwise
+# returns 1
+#
+# Usage:
+#
+#   if controller_gen_version_equals "v0.4.0"; then
+#       echo "controller-gen is at version 0.4.0"
+#   fi
+k8s_controller_gen_version_equals() {
+    currentver="$(controller-gen --version | cut -d' ' -f2 | tr -d '\n')";
+    requiredver="$1";
+    if [ "$currentver" = "$requiredver" ]; then
+        return 0
+    else
+        return 1
+    fi;
+}