Update default stack to Ubuntu Jammy Jellyfish (cloudfoundry#2622)

Update default stack to Ubuntu Jammy Jellyfish

- Ubuntu Bionic Beaver 18.04 left general support in April 2023 and mainline
CF has switched to cflinuxfs4 which is based on Jammy Jellyfish
22.04 LTS
- Add Helm configuration for ClusterStack ID
- Specify GOOS and GOARCH in build-dorifi make task.
This will allow the dorifi binary to be built on Mac OS hosts
and run on a Linux-based K8s cluster

Authored-by: Tim Downey <tdowney@vmware.com>

Author: tcdowney

Makefile

@@ -63,7 +63,7 @@ test-e2e: build-dorifi
 	./scripts/run-tests.sh tests/e2e
 
 build-dorifi:
-	CGO_ENABLED=0 go build -o ../dorifi/dorifi -C tests/e2e/assets/golang .
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ../dorifi/dorifi -C tests/e2e/assets/golang .
 
 GOFUMPT = $(shell go env GOPATH)/bin/gofumpt
 install-gofumpt:

README.helm.md

@@ -94,8 +94,9 @@ Here are all the values that can be set for the chart:
   - `builderReadinessTimeout` (_String_): The time that the kpack Builder will be waited for if not in ready state, berfore the build workload fails. See [`time.ParseDuration`](https://pkg.go.dev/time#ParseDuration) for details on the format, an additional `d` suffix for days is supported.
   - `builderRepository` (_String_): Container image repository to store the `ClusterBuilder` image. Required when `clusterBuilderName` is not provided.
   - `clusterBuilderName` (_String_): The name of the `ClusterBuilder` Kpack has been configured with. Leave blank to let `kpack-image-builder` create an example `ClusterBuilder`.
-  - `clusterStackBuildImage` (_String_): The image to use for building defined in the `ClusterStack`. Used when `kpack-image-builder` is blank.
-  - `clusterStackRunImage` (_String_): The image to use for running defined in the `ClusterStack`. Used when `kpack-image-builder` is blank.
+  - `clusterStackBuildImage` (_String_): The image to use for building defined in the `ClusterStack`. Used when `clusterBuilderName` is blank.
+  - `clusterStackID` (_String_): The ID of the `ClusterStack`. Used when `clusterBuilderName` is blank.
+  - `clusterStackRunImage` (_String_): The image to use for running defined in the `ClusterStack`. Used when `clusterBuilderName` is blank.
   - `include` (_Boolean_): Deploy the `kpack-image-builder` component.
   - `replicas` (_Integer_): Number of replicas.
   - `resources`: [`ResourceRequirements`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#resourcerequirements-v1-core) for the API.

README.md

@@ -43,4 +43,4 @@ Our [hacking guide](./HACKING.md) has instructions on how to work on the project
 
 This project is licensed under the [Apache License, Version 2.0](/LICENSE).
 
-When using the Korifi or other Cloud Foundry logos, be sure to follow the [guidelines](https://www.cloudfoundry.org/logo/).
+When using the Korifi or other Cloud Foundry logos be sure to follow the [guidelines](https://www.cloudfoundry.org/logo/).

helm/korifi/kpack-image-builder/cluster-builder.yaml

@@ -17,7 +17,7 @@ kind: ClusterStack
 metadata:
   name: cf-default-stack
 spec:
-  id: "io.buildpacks.stacks.bionic"
+  id: {{ .Values.kpackImageBuilder.clusterStackID | quote }}
   buildImage:
     image: {{ .Values.kpackImageBuilder.clusterStackBuildImage | quote }}
   runImage:

helm/korifi/values.schema.json

@@ -377,12 +377,16 @@
           "description": "The time that the kpack Builder will be waited for if not in ready state, berfore the build workload fails. See [`time.ParseDuration`](https://pkg.go.dev/time#ParseDuration) for details on the format, an additional `d` suffix for days is supported.",
           "type": "string"
         },
+        "clusterStackID": {
+          "description": "The ID of the `ClusterStack`. Used when `clusterBuilderName` is blank.",
+          "type": "string"
+        },
         "clusterStackBuildImage": {
-          "description": "The image to use for building defined in the `ClusterStack`. Used when `kpack-image-builder` is blank.",
+          "description": "The image to use for building defined in the `ClusterStack`. Used when `clusterBuilderName` is blank.",
           "type": "string"
         },
         "clusterStackRunImage": {
-          "description": "The image to use for running defined in the `ClusterStack`. Used when `kpack-image-builder` is blank.",
+          "description": "The image to use for running defined in the `ClusterStack`. Used when `clusterBuilderName` is blank.",
           "type": "string"
         },
         "builderRepository": {

helm/korifi/values.yaml

@@ -92,8 +92,9 @@ kpackImageBuilder:
 
   clusterBuilderName: ""
   builderReadinessTimeout: 30s
-  clusterStackBuildImage: paketobuildpacks/build:full-cnb
-  clusterStackRunImage: paketobuildpacks/run:full-cnb
+  clusterStackID: io.buildpacks.stacks.jammy
+  clusterStackBuildImage: paketobuildpacks/build-jammy-full
+  clusterStackRunImage: paketobuildpacks/run-jammy-full
   builderRepository: ""
 
 statefulsetRunner:

scripts/assets/values-template.yaml

@@ -22,5 +22,6 @@ jobTaskRunner:
   jobTTL: 5s
 
 kpackImageBuilder:
-  clusterStackBuildImage: paketobuildpacks/build:base-cnb
-  clusterStackRunImage: paketobuildpacks/run:base-cnb
+  clusterStackID: io.buildpacks.stacks.jammy
+  clusterStackBuildImage: paketobuildpacks/build-jammy-base
+  clusterStackRunImage: paketobuildpacks/run-jammy-base