Merge pull request openshift#117 from Nordix/v1alpha2

Fix broken deployment example and update kustomize

README.md

@@ -23,10 +23,14 @@ API used with this `cluster-api` provider.
 
 ## Run locally
 
+```sh
     make deploy-capi
     make install
     make run
+```
 
 ## Run in cluster
 
+```sh
     make deploy
+```

config/default/kustomization.yaml

@@ -18,5 +18,4 @@ resources:
 patchesStrategicMerge:
 - manager_image_patch.yaml
 - manager_auth_proxy_patch.yaml
-- manager_credentials_patch.yaml
 # - manager_prometheus_metrics_patch.yaml

config/manager/kustomization.yaml

@@ -6,10 +6,3 @@ resources:
 
 generatorOptions:
  disableNameSuffixHash: true
-
-secretGenerator:
-- name: manager-bootstrap-credentials
-  namespace: system
-  type: Opaque
-  envs:
-  - secrets.txt

examples/cluster/cluster.yaml

@@ -19,7 +19,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: BareMetalCluster
 metadata:
   name: ${CLUSTER_NAME}
-spec:
-  cloudName: ${CLUSTER_NAME}
-  cloudsSecret:
-    name: cloud-config
+# spec:
+#   cloudName: ${CLUSTER_NAME}
+#   cloudsSecret:
+#     name: cloud-config

examples/generate.sh

@@ -81,10 +81,6 @@ fi
 
 mkdir -p "${OUTPUT_DIR}"
 
-# Generate BAREMETAL Credentials.
-export SOME_CREDENTIALS="SOME_CREDENTIALS"
-export BAREMETAL_B64ENCODED_CREDENTIAL="$(echo -n "$SOME_CREDENTIALS" | base64 | tr -d '\n')"
-
 # Generate cluster resources.
 kustomize build "${SOURCE_DIR}/cluster" | envsubst > "${CLUSTER_GENERATED_FILE}"
 echo "Generated ${CLUSTER_GENERATED_FILE}"
@@ -118,4 +114,3 @@ echo "Generated ${COMPONENTS_BAREMETAL_GENERATED_FILE}"
 # Generate a single provider components file.
 kustomize build "${SOURCE_DIR}/provider-components" | envsubst > "${PROVIDER_COMPONENTS_GENERATED_FILE}"
 echo "Generated ${PROVIDER_COMPONENTS_GENERATED_FILE}"
-echo "WARNING: ${PROVIDER_COMPONENTS_GENERATED_FILE} includes BAREMETAL credentials"

go.mod

@@ -54,5 +54,5 @@ replace (
 	sigs.k8s.io/cluster-api => github.com/keleustes/cluster-api v1.16.1
 	sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm => github.com/keleustes/cluster-api-bootstrap-provider-kubeadm v1.16.1
 	sigs.k8s.io/controller-runtime => github.com/keleustes/controller-runtime v1.16.1
-	sigs.k8s.io/kustomize/v3 => github.com/keleustes/kustomize/v3 v3.16.1
+	sigs.k8s.io/kustomize/v3 => github.com/keleustes/kustomize/v3 v3.16.4
 )

hack/ensure-kustomize.sh

@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KUSTOMIZE_VERSION=v3.1.0
+MINIMUM_KUSTOMIZE_VERSION=v3.2.0
 
 # Ensure the kustomize tool exists and is a viable version, or installs it
 verify_kustomize_version() {
@@ -51,4 +51,4 @@ EOF
   fi
 }
 
-verify_kustomize_version
+verify_kustomize_version

hack/gofmt.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -eux
+
+IS_CONTAINER=${IS_CONTAINER:-false}
+
+if [ "${IS_CONTAINER}" != "false" ]; then
+  TOP_DIR="${1:-.}"
+  go fmt "${TOP_DIR}"/pkg/... "${TOP_DIR}"/cmd/...
+else
+  podman run --rm \
+    --env IS_CONTAINER=TRUE \
+    --volume "${PWD}:/workdir:ro,z" \
+    --entrypoint sh \
+    --workdir /workdir \
+    registry.hub.docker.com/library/golang:1.12 \
+    /workdir/hack/gofmt.sh "${@}"
+fi;

hack/govet.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -eux
+
+IS_CONTAINER=${IS_CONTAINER:-false}
+
+if [ "${IS_CONTAINER}" != "false" ]; then
+  TOP_DIR="${1:-.}"
+  go vet "${TOP_DIR}"/pkg/... "${TOP_DIR}"/cmd/...
+else
+  podman run --rm \
+    --env IS_CONTAINER=TRUE \
+    --volume "${PWD}:/go/src/github.com/metal3-io/cluster-api-provider-baremetal:ro,z" \
+    --entrypoint sh \
+    --workdir /go/src/github.com/metal3-io/cluster-api-provider-baremetal \
+    registry.hub.docker.com/library/golang:1.12 \
+    /go/src/github.com/metal3-io/cluster-api-provider-baremetal/hack/govet.sh "${@}"
+fi;