Merge pull request #3697 from sap-contributions/configurable-clusters…

…tore Disallow `ClusterStack` configuration
cloudfoundry · Jan 15, 2025 · 88e960d · 88e960d
2 parents 953e84f + d37086f
commit 88e960d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/helm/korifi/kpack-image-builder/cluster-builder.yaml b/helm/korifi/kpack-image-builder/cluster-builder.yaml
@@ -10,19 +10,17 @@ spec:
   - image: gcr.io/paketo-buildpacks/ruby
   - image: gcr.io/paketo-buildpacks/procfile
   - image: gcr.io/paketo-buildpacks/go
-
 ---
 apiVersion: kpack.io/v1alpha2
 kind: ClusterStack
 metadata:
   name: cf-default-stack
 spec:
-  id: {{ .Values.kpackImageBuilder.clusterStackID | quote }}
+  id: "io.buildpacks.stacks.jammy"
   buildImage:
-    image: {{ .Values.kpackImageBuilder.clusterStackBuildImage | quote }}
+    image: paketobuildpacks/build-jammy-full
   runImage:
-    image: {{ .Values.kpackImageBuilder.clusterStackRunImage | quote }}
-
+    image: paketobuildpacks/run-jammy-full
 ---
 apiVersion: kpack.io/v1alpha2
 kind: ClusterBuilder

diff --git a/helm/korifi/values.schema.json b/helm/korifi/values.schema.json
@@ -448,18 +448,6 @@
           "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 `clusterBuilderName` is blank.",
-          "type": "string"
-        },
-        "clusterStackRunImage": {
-          "description": "The image to use for running defined in the `ClusterStack`. Used when `clusterBuilderName` is blank.",
-          "type": "string"
-        },
         "builderRepository": {
           "description": "Container image repository to store the `ClusterBuilder` image. Required when `clusterBuilderName` is not provided.",
           "type": "string",

diff --git a/helm/korifi/values.yaml b/helm/korifi/values.yaml
@@ -106,9 +106,6 @@ kpackImageBuilder:
 
   clusterBuilderName: ""
   builderReadinessTimeout: 30s
-  clusterStackID: io.buildpacks.stacks.jammy
-  clusterStackBuildImage: paketobuildpacks/build-jammy-full
-  clusterStackRunImage: paketobuildpacks/run-jammy-full
   builderRepository: ""
 
 statefulsetRunner: