From d37086fc32001cbc905208b756422563d4053a5a Mon Sep 17 00:00:00 2001 From: Pavel Busko Date: Wed, 15 Jan 2025 07:51:34 +0100 Subject: [PATCH] remove ClusterStack values from the chart --- helm/korifi/kpack-image-builder/cluster-builder.yaml | 8 +++----- helm/korifi/values.schema.json | 12 ------------ helm/korifi/values.yaml | 3 --- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/helm/korifi/kpack-image-builder/cluster-builder.yaml b/helm/korifi/kpack-image-builder/cluster-builder.yaml index 7c1674c60..c3bb67be9 100644 --- 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 index 2e5d656fa..65df105a2 100644 --- 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 index d2fa46530..d6599d800 100644 --- a/helm/korifi/values.yaml +++ b/helm/korifi/values.yaml @@ -105,9 +105,6 @@ kpackImageBuilder: clusterBuilderName: "" builderReadinessTimeout: 30s - clusterStackID: io.buildpacks.stacks.jammy - clusterStackBuildImage: paketobuildpacks/build-jammy-full - clusterStackRunImage: paketobuildpacks/run-jammy-full builderRepository: "" statefulsetRunner: