rename K8S_VERSION_FROM_DRONE to K8S_VERSION_FROM_CI

Signed-off-by: Alexandre Lamarre <[email protected]>
rancher · Apr 11, 2024 · 25859b2 · 25859b2
1 parent f011da1
commit 25859b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -10,7 +10,7 @@ steps:
 - name: build
   image: rancher/dapper:v0.6.0
   commands:
-  - export K8S_VERSION_FROM_DRONE="v1.24"
+  - export K8S_VERSION_FROM_CI="v1.24"
   - dapper ci
   volumes:
   - name: docker
@@ -21,7 +21,7 @@ steps:
 - name: build_no_psp
   image: rancher/dapper:v0.6.0
   commands:
-  - export K8S_VERSION_FROM_DRONE="stable"
+  - export K8S_VERSION_FROM_CI="stable"
   - dapper ci
   volumes:
   - name: docker
@@ -129,7 +129,7 @@ steps:
 - name: build
   image: rancher/dapper:v0.6.0
   commands:
-  - export K8S_VERSION_FROM_DRONE="v1.24"
+  - export K8S_VERSION_FROM_CI="v1.24"
   - dapper ci
   volumes:
   - name: docker
@@ -138,7 +138,7 @@ steps:
 - name: build_no_psp
   image: rancher/dapper:v0.6.0
   commands:
-  - export K8S_VERSION_FROM_DRONE="stable"
+  - export K8S_VERSION_FROM_CI="stable"
   - dapper ci
   volumes:
   - name: docker

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,6 +15,7 @@ jobs:
     runs-on : ubuntu-latest
     strategy:
       matrix:
+          K8S_VERSION_FROM_CI : ["v1.24","stable"]
           include:
             - platform: linux/amd64
             - platform: linux/arm64
@@ -24,4 +25,4 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3 
       - name : CI
-        run : make ci
+        run : make ci
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -21,11 +21,11 @@ ENV K3S_BINARY_amd64=k3s \
     K3S_BINARY_arm64=k3s-arm64 \
     K3S_BINARY=K3S_BINARY_${ARCH}
 
-ARG K8S_VERSION_FROM_DRONE
-ENV K8S_VERSION $K8S_VERSION_FROM_DRONE
+ARG K8S_VERSION_FROM_CI
+ENV K8S_VERSION $K8S_VERSION_FROM_CI
 
 RUN if [ -z "${K8S_VERSION}" ]; then export K8S_VERSION="v1.24" && echo $(date +%s%N); fi
-# ENV K8S_VERSION="${K8S_VERSION_FROM_DRONE:-'v1.24'}"
+# ENV K8S_VERSION="${K8S_VERSION_FROM_CI:-'v1.24'}"
 
 RUN echo "${K8S_VERSION}"
 

diff --git a/scripts/package b/scripts/package
@@ -19,9 +19,9 @@ if [ -e ${DOCKERFILE}.${ARCH} ]; then
 fi
 
 if [[ ${USE_DOCKER_BUILDX} -eq 1 ]]; then
-    docker buildx build --build-arg K8S_VERSION_FROM_DRONE="${K8S_VERSION}" --platform linux/amd64 -f ${DOCKERFILE} . -t ${IMAGE} 
+    docker buildx build --build-arg K8S_VERSION_FROM_CI="${K8S_VERSION}" --platform linux/amd64 -f ${DOCKERFILE} . -t ${IMAGE} 
 else
-    docker build --build-arg K8S_VERSION_FROM_DRONE="${K8S_VERSION}" -f ${DOCKERFILE} -t ${IMAGE} .
+    docker build --build-arg K8S_VERSION_FROM_CI="${K8S_VERSION}" -f ${DOCKERFILE} -t ${IMAGE} .
 fi
 echo Built ${IMAGE}