Merge pull request Stratio#4 from Stratio/PLT-589

Start changes to builder

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Changelog
 
-## 1.6.0-0.1.0 (upcoming)
+## 1.6.1-0.1.0 (upcoming)
 
 * Add the PRs that have not yet been merged

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.21.9@sha256:ff6cfbd291c157a5b67e121b050e80a646a88b55de5c489a5c07acb9528a1feb as builder
+FROM golang:1.21.9 AS builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
@@ -23,23 +23,47 @@ ENV GOPROXY=$goproxy
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
+
 # Cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the sources
 COPY ./ ./
 
-# Build
+# Build the binary
 ARG ARCH
 ARG LDFLAGS
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
     go build -a -trimpath -ldflags "${LDFLAGS} -extldflags '-static'" \
     -o manager .
 
-# Copy the controller-manager into a thin image
-FROM cgr.dev/chainguard/static:latest
+# Final stage with Alpine
+FROM alpine:3.18
+
+# Install dependencies
+RUN apk add --no-cache \
+    git \
+    python3 \
+    py3-pip \
+    curl \
+    bash \
+    libc6-compat
+
+# Install Google Cloud SDK
+RUN curl -LO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-428.0.0-linux-x86_64.tar.gz \
+    && tar -xzvf google-cloud-sdk-428.0.0-linux-x86_64.tar.gz \
+    && rm google-cloud-sdk-428.0.0-linux-x86_64.tar.gz \
+    && ./google-cloud-sdk/install.sh -q
+
+# Update PATH to include the Google Cloud SDK directory
+ENV PATH="/google-cloud-sdk/bin:${PATH}"
+
+# Install Python dependencies for gcloud
+RUN pip3 install --upgrade pip \
+    && pip3 install -U crcmod
+
 WORKDIR /
 COPY --from=builder /workspace/manager .
 USER nobody
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["/manager"]

Jenkinsfile

@@ -1,10 +1,10 @@
 @Library('libpipelines@master') _
 
 hose {
-    EMAIL = 'clouds-integration@stratio.com'
+    EMAIL = 'none@stratio.com'
     BUILDTOOL = 'make'
     VERSIONING_TYPE = 'stratioVersion-3-3'
-    UPSTREAM_VERSION = '1.6.0'
+    UPSTREAM_VERSION = '1.6.1'
     DEPLOYONPRS = true
     DEVTIMEOUT = 30
     ANCHORE_POLICY = "production"
@@ -14,6 +14,6 @@ hose {
     BUILDTOOL_MEMORY_LIMIT = "4096Mi"
 
     DEV = { config ->
-        doDocker(conf:config, dockerfile: 'Dockerfile', image:'cluster-api-provider-gcp')
+        doDocker(conf:config, dockerfile: 'Dockerfile', image:'cluster-api-gcp-controller')
     }
 }

VERSION

@@ -1 +1 @@
-0.1.0-SNAPSHOT
+0.1.0-SNAPSHOT

hack/custom/change-version.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+BASEDIR=`dirname $0`/../..
+
+cd $BASEDIR
+
+if [[ -z "$1" ]]; then
+	VERSION=$(cat $BASEDIR/VERSION)
+else
+	VERSION=$1
+fi
+
+echo "Modifying cluster-provisioner version to: $1"
+echo $VERSION > VERSION