From 6c1914f6e94a4814dc6f20097f9bf82a17bda201 Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Fri, 26 Jan 2024 19:10:56 +0800 Subject: [PATCH] Upgrade kpack to 0.11.5 --- charts/kpack/Chart.yaml | 4 +-- .../charts/crds/templates/buildpack.yaml | 31 +++++++++++++++++++ .../crds/templates/cluster-buildpack.yaml | 31 +++++++++++++++++++ .../charts/crds/templates/cluster-stack.yaml | 1 - charts/kpack/templates/cluster-role.yaml | 4 +++ charts/kpack/templates/config-map.yaml | 14 ++++----- .../templates/controller-deployment.yaml | 11 ++++--- .../kpack/templates/webhook-deployment.yaml | 4 +-- 8 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 charts/kpack/charts/crds/templates/buildpack.yaml create mode 100644 charts/kpack/charts/crds/templates/cluster-buildpack.yaml diff --git a/charts/kpack/Chart.yaml b/charts/kpack/Chart.yaml index cc42f77..3c691e0 100644 --- a/charts/kpack/Chart.yaml +++ b/charts/kpack/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.1 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.9.1" +appVersion: "0.11.5" diff --git a/charts/kpack/charts/crds/templates/buildpack.yaml b/charts/kpack/charts/crds/templates/buildpack.yaml new file mode 100644 index 0000000..a684dc9 --- /dev/null +++ b/charts/kpack/charts/crds/templates/buildpack.yaml @@ -0,0 +1,31 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: buildpacks.kpack.io +spec: + group: kpack.io + versions: + - name: v1alpha2 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Ready + type: string + jsonPath: .status.conditions[?(@.type=="Ready")].status + names: + kind: Buildpack + listKind: BuildpackList + singular: buildpack + plural: buildpacks + shortNames: + - bp + - bps + categories: + - kpack + scope: Namespaced diff --git a/charts/kpack/charts/crds/templates/cluster-buildpack.yaml b/charts/kpack/charts/crds/templates/cluster-buildpack.yaml new file mode 100644 index 0000000..658dd9a --- /dev/null +++ b/charts/kpack/charts/crds/templates/cluster-buildpack.yaml @@ -0,0 +1,31 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: clusterbuildpacks.kpack.io +spec: + group: kpack.io + versions: + - name: v1alpha2 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Ready + type: string + jsonPath: .status.conditions[?(@.type=="Ready")].status + names: + kind: ClusterBuildpack + listKind: ClusterBuildpackList + singular: clusterbuildpack + plural: clusterbuildpacks + shortNames: + - clstbp + - clstbps + categories: + - kpack + scope: Cluster diff --git a/charts/kpack/charts/crds/templates/cluster-stack.yaml b/charts/kpack/charts/crds/templates/cluster-stack.yaml index a911a01..c764084 100644 --- a/charts/kpack/charts/crds/templates/cluster-stack.yaml +++ b/charts/kpack/charts/crds/templates/cluster-stack.yaml @@ -1,4 +1,3 @@ - apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/kpack/templates/cluster-role.yaml b/charts/kpack/templates/cluster-role.yaml index d30ee99..4222333 100644 --- a/charts/kpack/templates/cluster-role.yaml +++ b/charts/kpack/templates/cluster-role.yaml @@ -14,8 +14,12 @@ rules: - images/finalizers - builders - builders/status + - buildpacks + - buildpacks/status - clusterbuilders - clusterbuilders/status + - clusterbuildpacks + - clusterbuildpacks/status - clusterstores - clusterstores/status - clusterstacks diff --git a/charts/kpack/templates/config-map.yaml b/charts/kpack/templates/config-map.yaml index 6b18909..c43e7cd 100644 --- a/charts/kpack/templates/config-map.yaml +++ b/charts/kpack/templates/config-map.yaml @@ -30,46 +30,46 @@ kind: ConfigMap metadata: name: build-init-image data: - image: gcr.io/cf-build-service-public/kpack/build-init@sha256:a4201fba41f408f32dec3dcc11d1a4e44db7794d4d1a883dd4d20432fed0f3e6 + image: gcr.io/cf-build-service-public/kpack/build-init@sha256:189b8a9cf31950615e1c7e4516f99c69c128ffbd4264b3c2c435d5aca86de26e --- apiVersion: v1 kind: ConfigMap metadata: name: build-init-windows-image data: - image: gcr.io/cf-build-service-public/kpack/build-init-windows@sha256:c4961a33a4c6e269705792e58d175f06410268410bcffff85461144dd823b61c + image: gcr.io/cf-build-service-public/kpack/build-init-windows@sha256:c5c3beace3a10ad1119a8c031f98d6afb89a727211bc3a75bb565171e947d69d --- apiVersion: v1 kind: ConfigMap metadata: name: build-waiter-image data: - image: gcr.io/cf-build-service-public/kpack/build-waiter@sha256:e9ce0fd700d41cf6a47d21ee544aa9b065cbc32391671848841f757e830fdb13 + image: gcr.io/cf-build-service-public/kpack/build-waiter@sha256:d770e1c782a827c7532a29036fe73840b4301addf81aad5d2312d45d2a3d2175 --- apiVersion: v1 kind: ConfigMap metadata: name: rebase-image data: - image: gcr.io/cf-build-service-public/kpack/rebase@sha256:eb4acd119d2dc28e11ba7f895855fe3ad7654b4ec5886a1d8942b7575cad2a0a + image: gcr.io/cf-build-service-public/kpack/rebase@sha256:5ca8b58d10eeb58d5796a9f2a69814cd1a34838da5115c25d9ca2263b9d32c7f --- apiVersion: v1 kind: ConfigMap metadata: name: lifecycle-image data: - image: gcr.io/cf-build-service-public/kpack/lifecycle@sha256:284a738d402060ffd196bf65c4ad1177dbf24278207bee09037eeab613653b2f + image: gcr.io/cf-build-service-public/kpack/lifecycle@sha256:35b5e30b71461448990ef739d8b6429d050c1e6f0693a5fe292f981365bb13f2 --- apiVersion: v1 kind: ConfigMap metadata: name: completion-image data: - image: gcr.io/cf-build-service-public/kpack/completion@sha256:13a1142178e6380a81f9e03ad604553053d51e23b90b0ea41e9f2a6f0016f8cd + image: gcr.io/cf-build-service-public/kpack/completion@sha256:94bc8f1f05c511e75c5a55f67f57712772541c200a65d1b3e539b8f60ae56777 --- apiVersion: v1 kind: ConfigMap metadata: name: completion-windows-image data: - image: gcr.io/cf-build-service-public/kpack/completion-windows@sha256:0d8a465e660d9cd4ea4f070813bc9b8ef83b9fa8345617ea12810db0c068e8bf + image: gcr.io/cf-build-service-public/kpack/completion-windows@sha256:5ef19c84b032813cf525ac31a598cf1e07880cbbe3604b585df1d01ed204b8ec diff --git a/charts/kpack/templates/controller-deployment.yaml b/charts/kpack/templates/controller-deployment.yaml index 12450b0..4ca7ff0 100644 --- a/charts/kpack/templates/controller-deployment.yaml +++ b/charts/kpack/templates/controller-deployment.yaml @@ -11,7 +11,7 @@ spec: metadata: labels: app: kpack-controller - version: 0.9.1-rc.1 + version: dev spec: securityContext: runAsNonRoot: true @@ -32,12 +32,14 @@ spec: capabilities: drop: - ALL - image: gcr.io/cf-build-service-public/kpack/controller@sha256:cedc61102e25acc35fca56e46a884ccd4d28fc8f3736dba46f83865b94cffb50 + image: gcr.io/cf-build-service-public/kpack/controller@sha256:b399a5e304645be89666ac09340fc3a34e93f42c287a9574e9c8efbf664e518a env: - name: ENABLE_PRIORITY_CLASSES value: "false" - name: INJECTED_SIDECAR_SUPPORT value: "false" + - name: INSECURE_SSH_TRUST_UNKNOWN_HOSTS + value: "true" - name: CONFIG_LOGGING_NAME value: config-logging - name: CONFIG_OBSERVABILITY_NAME @@ -81,7 +83,6 @@ spec: resources: requests: cpu: 20m - memory: 100Mi + memory: 1Gi limits: - cpu: 100m - memory: 500Mi + memory: 1Gi diff --git a/charts/kpack/templates/webhook-deployment.yaml b/charts/kpack/templates/webhook-deployment.yaml index 9d7149e..7e7d2af 100644 --- a/charts/kpack/templates/webhook-deployment.yaml +++ b/charts/kpack/templates/webhook-deployment.yaml @@ -12,7 +12,7 @@ spec: labels: app: kpack-webhook role: kpack-webhook - version: 0.9.1-rc.1 + version: dev spec: securityContext: runAsNonRoot: true @@ -33,7 +33,7 @@ spec: capabilities: drop: - ALL - image: gcr.io/cf-build-service-public/kpack/webhook@sha256:234295ce78187e351bfa20f81e03e49c4d789cebdfb20d077ab1f24ffe4f3df2 + image: gcr.io/cf-build-service-public/kpack/webhook@sha256:2561c07f4953f4313aa566f379edab2975f6b35c574c300908ec06bb3e02d2e4 ports: - name: https-webhook containerPort: 8443