Build fileserver image using cf-k8s-releases for e2e testing

.github/actions/build-fileserver-image/action.yaml

@@ -0,0 +1,58 @@
+name: Build fileserver image
+
+inputs:
+  ref:
+    required: true
+
+outputs:
+  load-images:
+    value: ${{ steps.build.outputs.list }}
+  values-file:
+    value: ${{ steps.values.outputs.file }}
+
+runs:
+  using: composite
+  steps:
+    - uses: docker/setup-buildx-action@v4
+    - uses: actions/setup-go@v7
+      with:
+        go-version: stable
+    - uses: actions/checkout@v7
+      with:
+        repository: cloudfoundry/diego-release
+        path: diego-release
+        submodules: true
+    - uses: actions/checkout@v7
+      with:
+        repository: cloudfoundry/cf-k8s-releases
+        path: cf-k8s-releases
+    - name: Bump diego-release's cnbapplifecycle to the commit under test
+      shell: bash
+      working-directory: ${{ github.workspace }}/diego-release/src/code.cloudfoundry.org
+      run: |
+        go get -u code.cloudfoundry.org/cnbapplifecycle@${{ inputs.ref }}
+        go mod vendor
+    - name: Build fileserver image
+      id: build
+      shell: bash
+      working-directory: ${{ github.workspace }}/cf-k8s-releases/diego
+      env:
+        BUILDX_BAKE_ENTITLEMENTS_FS: "0"
+      run: |
+        docker buildx bake fileserver --load \
+          --set fileserver.contexts.src="${{ github.workspace }}/diego-release/src" \
+          --set fileserver.contexts.config="${{ github.workspace }}/diego-release/config"
+        echo "list=$(docker buildx bake fileserver --print | jq -r '[.target[].tags[]] | join(",")')" >> "$GITHUB_OUTPUT"
+    - name: Pin diego helm chart to the built fileserver
+      id: values
+      shell: bash
+      working-directory: ${{ github.workspace }}/cf-k8s-releases
+      run: |
+        yq -e -i '.fileserver.image.repository = "fileserver"' diego/helm/values.yaml
+        file="${{ runner.temp }}/state-values.yaml"
+        cat > "$file" <<EOF
+        charts:
+          diego:
+            url: ${{ github.workspace }}/cf-k8s-releases/diego/helm
+        EOF
+        echo "file=$file" >> "$GITHUB_OUTPUT"

.github/workflows/e2e.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-      - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf@main
+      - name: Build fileserver image
+        id: fileserver
+        uses: ./.github/actions/build-fileserver-image
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+      - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf@v0.26.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build cnbapplifecycle.tgz
-        run: make copy-binaries package
-      - name: Load updated cnbapplifecycle.tgz into kind
-        run: |
-          kubectl cp bin/cnb_app_lifecycle.tgz \
-          cf-system/$(kubectl get pod -n cf-system -l app.kubernetes.io/name=fileserver \
-          -o jsonpath='{.items[0].metadata.name}'):fileserver/v1/static/cnb_app_lifecycle/cnb_app_lifecycle.tgz
+          load-images: ${{ steps.fileserver.outputs.load-images }}
+          additional-values-files: ${{ steps.fileserver.outputs.values-file }}
       - name: Run E2E tests for java
         run: |
           cf push hello-java -f examples/hello-java/manifest.yaml

.github/workflows/go.yaml

@@ -28,17 +28,3 @@ jobs:
         with:
           go-version: stable
       - run: make lint
-  diego-compat:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          repository: cloudfoundry/diego-release
-          ref: develop
-          submodules: recursive
-      - uses: actions/setup-go@v7
-        with:
-          go-version: stable
-      - run: |
-          cd src/code.cloudfoundry.org && go get -u code.cloudfoundry.org/cnbapplifecycle@${{ github.event.pull_request.head.sha }}

.github/workflows/kind-cats.yaml

@@ -13,17 +13,17 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v7
-      - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf@v0.25.0
+      - name: Build fileserver image
+        id: fileserver
+        uses: ./.github/actions/build-fileserver-image
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+      - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf@v0.26.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build cnbapplifecycle.tgz
-        run: make copy-binaries package
-      - name: Load updated cnbapplifecycle.tgz into kind
-        run: |
-          kubectl cp bin/cnb_app_lifecycle.tgz \
-          cf-system/$(kubectl get pod -n cf-system -l app.kubernetes.io/name=fileserver \
-          -o jsonpath='{.items[0].metadata.name}'):fileserver/v1/static/cnb_app_lifecycle/cnb_app_lifecycle.tgz
-      - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf-tests@v0.25.0
+          load-images: ${{ steps.fileserver.outputs.load-images }}
+          additional-values-files: ${{ steps.fileserver.outputs.values-file }}
+      - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf-tests@v0.26.0
         with:
           test-repo: cf-acceptance-tests
           config-template: ${{ github.workspace }}/.github/cats-config.tpl

Makefile

@@ -14,7 +14,7 @@ integration: build
 copy-binaries: 
 	mkdir -p bin/diego/
 	CONTAINER=$$(docker create ghcr.io/cloudfoundry/k8s/fileserver:latest); \
-	docker cp $$CONTAINER:fileserver/v1/static/cnb_app_lifecycle/cnb_app_lifecycle.tgz bin/diego/; \
+	docker cp $$CONTAINER:/static/cnb_app_lifecycle/cnb_app_lifecycle.tgz bin/diego/; \
 	docker rm $$CONTAINER
 	tar -xf bin/diego/cnb_app_lifecycle.tgz -C bin/diego/
 	mv bin/diego/diego-sshd bin/