Merge pull request #144 from Nordix/uplift-capi-to-v1.1.6/furkat

🌱 Uplift CAPI to v1.1.6

Author: metal3-io-bot

go.mod

@@ -15,7 +15,7 @@ require (
 	k8s.io/client-go v0.23.5
 	k8s.io/klog/v2 v2.30.0
 	k8s.io/utils v0.0.0-20211116205334-6203023598ed
-	sigs.k8s.io/cluster-api v1.1.5
+	sigs.k8s.io/cluster-api v1.1.6
 	sigs.k8s.io/controller-runtime v0.11.2
 )
 

go.sum

@@ -1171,8 +1171,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
-sigs.k8s.io/cluster-api v1.1.5 h1:4gV3mg1mlwrm3bFWeXADfL9ILRyufjR47KpwBL3PT6Y=
-sigs.k8s.io/cluster-api v1.1.5/go.mod h1:WBPgw1yJdvybx/U3Ib49T9Q4JurairgnA/s0afxuE/w=
+sigs.k8s.io/cluster-api v1.1.6 h1:fd0ap613+3YgKjZ28cN6GzPo5czyTcuyGPV4U60RtjA=
+sigs.k8s.io/cluster-api v1.1.6/go.mod h1:WBPgw1yJdvybx/U3Ib49T9Q4JurairgnA/s0afxuE/w=
 sigs.k8s.io/controller-runtime v0.11.2 h1:H5GTxQl0Mc9UjRJhORusqfJCIjBO8UtUxGggCwL1rLA=
 sigs.k8s.io/controller-runtime v0.11.2/go.mod h1:P6QCzrEjLaZGqHsfd+os7JQ+WFZhvB8MRFsn4dWF7O4=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=

hack/codegen.sh

@@ -31,9 +31,9 @@ if [ "${IS_CONTAINER}" != "false" ]; then
 else
   "${CONTAINER_RUNTIME}" run --rm \
     --env IS_CONTAINER=TRUE \
-    --volume "${PWD}:/data:rw,z" \
+    --volume "${PWD}:/metal3-ipam:rw,z" \
     --entrypoint sh \
-    --workdir /data \
+    --workdir /metal3-ipam \
     registry.hub.docker.com/library/golang:1.17 \
-    /data/hack/codegen.sh
+    /metal3-ipam/hack/codegen.sh
 fi;

hack/ensure-golangci-lint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -eux
+
+IS_CONTAINER=${IS_CONTAINER:-false}
+CONTAINER_RUNTIME="${CONTAINER_RUNTIME:-podman}"
+
+if [ "${IS_CONTAINER}" != "false" ]; then
+  export XDG_CACHE_HOME=/tmp/.cache
+  mkdir /tmp/unit
+  cp -r . /tmp/unit
+  cd /tmp/unit
+  make lint
+else
+  "${CONTAINER_RUNTIME}" run --rm \
+    --env IS_CONTAINER=TRUE \
+    --volume "${PWD}:/metal3-ipam:ro,z" \
+    --entrypoint sh \
+    --workdir /metal3-ipam \
+    docker.io/golang:1.17 \
+    /metal3-ipam/hack/ensure-golangci-lint.sh
+fi;

hack/gomod.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# 1.  Verify that `go mod tidy` can be executed successfully
+# 2.  Verify that running the above doesn't change go.mod and go.sum
+#
+# NOTE: This won't work unless the build environment has internet access
+
+set -ux
+
+IS_CONTAINER=${IS_CONTAINER:-false}
+CONTAINER_RUNTIME="${CONTAINER_RUNTIME:-podman}"
+
+if [ "${IS_CONTAINER}" != "false" ]; then
+  export XDG_CACHE_HOME="/tmp/.cache"
+
+  STATUS=$(git status --porcelain)
+  if [ -n "$STATUS" ]; then
+      echo "Dirty tree: refusing to continue out of caution"
+      exit 1
+  fi
+
+  go mod tidy
+  rc=$?
+
+  if [ $rc -ne 0 ]; then
+      echo "'go mod tidy' failed"
+      exit 1;
+  fi
+
+  STATUS=$(git status --porcelain go.mod go.sum)
+  if [ -n "$STATUS" ]; then
+      echo "go.mod and go.sum changed"
+      echo "Please run 'go mod tidy' and commit the changes to go.mod & go.sum."
+      echo "Abort"
+      exit 1
+  fi
+
+  exit 0;
+
+else
+  "${CONTAINER_RUNTIME}" run --rm \
+    --env IS_CONTAINER=TRUE \
+    --volume "${PWD}:/metal3-ipam:ro,z"  \
+    --entrypoint sh \
+    --workdir /metal3-ipam \
+    registry.hub.docker.com/library/golang:1.17 \
+    /metal3-ipam/hack/gomod.sh "${@}"
+fi;

hack/gosec.sh

@@ -12,9 +12,9 @@ if [ "${IS_CONTAINER}" != "false" ]; then
 else
   "${CONTAINER_RUNTIME}" run --rm \
     --env IS_CONTAINER=TRUE \
-    --volume "${PWD}:/capm3:ro,z" \
+    --volume "${PWD}:/metal3-ipam:ro,z" \
     --entrypoint sh \
-    --workdir /capm3 \
+    --workdir /metal3-ipam \
     registry.hub.docker.com/securego/gosec:latest \
-    /capm3/hack/gosec.sh
+    /metal3-ipam/hack/gosec.sh
 fi;

hack/manifestlint.sh

@@ -25,9 +25,9 @@ if [ "${IS_CONTAINER}" != "false" ]; then
 else
   "${CONTAINER_RUNTIME}" run --rm \
     --env IS_CONTAINER=TRUE \
-    --volume "${PWD}:/workdir:ro,z" \
+    --volume "${PWD}:/metal3-ipam:ro,z" \
     --entrypoint sh \
-    --workdir /workdir \
+    --workdir /metal3-ipam \
     garethr/kubeval:latest \
-    /workdir/hack/manifestlint.sh "${@}"
+    /metal3-ipam/hack/manifestlint.sh "${@}"
 fi;

hack/markdownlint.sh

@@ -11,9 +11,9 @@ if [ "${IS_CONTAINER}" != "false" ]; then
 else
   "${CONTAINER_RUNTIME}" run --rm \
     --env IS_CONTAINER=TRUE \
-    --volume "${PWD}:/workdir:ro,z" \
+    --volume "${PWD}:/metal3-ipam:ro,z" \
     --entrypoint sh \
-    --workdir /workdir \
+    --workdir /metal3-ipam \
     registry.hub.docker.com/pipelinecomponents/markdownlint:latest \
-    /workdir/hack/markdownlint.sh "${@}"
+    /metal3-ipam/hack/markdownlint.sh "${@}"
 fi;