Skip to content

Commit 1666070

Browse files
committed
Remove PSP support
1 parent 75119dd commit 1666070

18 files changed

+14
-598
lines changed

.ci/clusters/values-psp.yaml

-22
This file was deleted.

.github/workflows/pulsar-helm-chart-ci.yaml

+10-21
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
--validate-maintainers=false \
132132
--target-branch ${{ github.event.repository.default_branch }}
133133
134-
- name: Run kubeconform check for helm template with every major k8s version 1.23.0-1.32.0
134+
- name: Run kubeconform check for helm template with every major k8s version 1.25.0-1.32.0
135135
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
136136
run: |
137137
PULSAR_CHART_HOME=$(pwd)
@@ -155,7 +155,7 @@ jobs:
155155
kubeconform -schema-location default -schema-location 'https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' -strict -kubernetes-version $kube_version -summary
156156
}
157157
set -o pipefail
158-
for k8s_version_part in {23..32}; do
158+
for k8s_version_part in {25..32}; do
159159
k8s_version="1.${k8s_version_part}.0"
160160
echo "Validating default values with k8s version $k8s_version"
161161
validate_helm_template_with_k8s_version $k8s_version
@@ -190,8 +190,8 @@ jobs:
190190
# see https://github.com/kubernetes-sigs/kind/releases/tag/v0.27.0 for the list of supported k8s versions for kind 0.27.0
191191
# docker images are available at https://hub.docker.com/r/kindest/node/tags
192192
k8sVersion:
193-
- version: "1.23.17"
194-
kind_image_tag: v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3
193+
- version: "1.25.16"
194+
kind_image_tag: kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025
195195
- version: "1.32.2"
196196
kind_image_tag: v1.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f
197197
testScenario:
@@ -223,9 +223,6 @@ jobs:
223223
- name: ZK & BK TLS Only
224224
values_file: .ci/clusters/values-zkbk-tls.yaml
225225
shortname: zkbk-tls
226-
- name: PSP
227-
values_file: .ci/clusters/values-psp.yaml
228-
shortname: psp
229226
- name: Pulsar Manager
230227
values_file: .ci/clusters/values-pulsar-manager.yaml
231228
shortname: pulsar-manager
@@ -234,33 +231,25 @@ jobs:
234231
shortname: oxia
235232
include:
236233
- k8sVersion:
237-
version: "1.23.17"
238-
kind_image_tag: v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3
234+
version: "1.25.16"
235+
kind_image_tag: kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025
239236
testScenario:
240237
name: "Upgrade TLS"
241238
values_file: .ci/clusters/values-tls.yaml
242239
shortname: tls
243240
type: upgrade
244241
- k8sVersion:
245-
version: "1.23.17"
246-
kind_image_tag: v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3
247-
testScenario:
248-
name: "Upgrade PSP"
249-
values_file: .ci/clusters/values-psp.yaml
250-
shortname: psp
251-
type: upgrade
252-
- k8sVersion:
253-
version: "1.23.17"
254-
kind_image_tag: v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3
242+
version: "1.25.16"
243+
kind_image_tag: kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025
255244
testScenario:
256245
name: "Upgrade kube-prometheus-stack for previous LTS"
257246
values_file: .ci/clusters/values-prometheus-grafana.yaml --values .ci/clusters/values-pulsar-previous-lts.yaml
258247
shortname: prometheus-grafana
259248
type: upgrade
260249
upgradeFromVersion: 3.2.0
261250
- k8sVersion:
262-
version: "1.23.17"
263-
kind_image_tag: v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3
251+
version: "1.25.16"
252+
kind_image_tag: kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025
264253
testScenario:
265254
name: "TLS with helm 3.12.0"
266255
values_file: .ci/clusters/values-tls.yaml

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ It includes support for:
177177

178178
In order to use this chart to deploy Apache Pulsar on Kubernetes, the followings are required.
179179

180-
1. kubectl 1.23 or higher, compatible with your cluster ([+/- 1 minor release from your cluster](https://kubernetes.io/docs/tasks/tools/install-kubectl/#before-you-begin))
180+
1. kubectl 1.25 or higher, compatible with your cluster ([+/- 1 minor release from your cluster](https://kubernetes.io/docs/tasks/tools/install-kubectl/#before-you-begin))
181181
2. Helm v3 (3.12.0 or higher)
182-
3. A Kubernetes cluster, version 1.23 or higher.
182+
3. A Kubernetes cluster, version 1.25 or higher.
183183

184184
## Environment setup
185185

@@ -200,7 +200,7 @@ helm repo update
200200

201201
## Kubernetes cluster preparation
202202

203-
You need a Kubernetes cluster whose version is 1.23 or higher in order to use this chart, due to the usage of certain Kubernetes features.
203+
You need a Kubernetes cluster whose version is 1.25 or higher in order to use this chart, due to the usage of certain Kubernetes features.
204204

205205
We provide some instructions to guide you through the preparation: http://pulsar.apache.org/docs/helm-prepare/
206206

charts/pulsar/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ appVersion: "4.0.3"
2222
description: Apache Pulsar Helm chart for Kubernetes
2323
name: pulsar
2424
version: 4.0.0
25-
kubeVersion: ">=1.23.0-0"
25+
kubeVersion: ">=1.25.0-0"
2626
home: https://pulsar.apache.org
2727
sources:
2828
- https://github.com/apache/pulsar

charts/pulsar/templates/autorecovery-psp.yaml

-85
This file was deleted.

charts/pulsar/templates/autorecovery-statefulset.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ spec:
140140
resources:
141141
{{ toYaml .Values.autorecovery.resources | indent 10 }}
142142
{{- end }}
143-
{{- if and (semverCompare "<1.25-0" .Capabilities.KubeVersion.Version) .Values.rbac.enabled .Values.rbac.psp }}
144-
securityContext:
145-
readOnlyRootFilesystem: false
146-
{{- end}}
147143
command: ["sh", "-c"]
148144
args:
149145
- |

charts/pulsar/templates/bookkeeper-cluster-initialize.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ spec:
101101
{{- if .Values.extraInitCommand }}
102102
{{ .Values.extraInitCommand }}
103103
{{- end }}
104-
{{- if and (semverCompare "<1.25-0" .Capabilities.KubeVersion.Version) .Values.rbac.enabled .Values.rbac.psp }}
105-
securityContext:
106-
readOnlyRootFilesystem: false
107-
{{- end }}
108104
envFrom:
109105
- configMapRef:
110106
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"

charts/pulsar/templates/bookkeeper-psp.yaml

-85
This file was deleted.

charts/pulsar/templates/bookkeeper-statefulset.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ spec:
128128
envFrom:
129129
- configMapRef:
130130
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
131-
{{- if and (semverCompare "<1.25-0" .Capabilities.KubeVersion.Version) .Values.rbac.enabled .Values.rbac.psp }}
132-
securityContext:
133-
readOnlyRootFilesystem: false
134-
{{- end}}
135131
volumeMounts:
136132
{{- include "pulsar.bookkeeper.certs.volumeMounts" . | nindent 8 }}
137133
{{- end }}
@@ -201,10 +197,6 @@ spec:
201197
bin/apply-config-from-env.py conf/bookkeeper.conf;
202198
{{- include "pulsar.bookkeeper.zookeeper.tls.settings" . | nindent 10 }}
203199
OPTS="${OPTS} -Dlog4j2.formatMsgNoLookups=true" exec bin/pulsar bookie;
204-
{{- if and (semverCompare "<1.25-0" .Capabilities.KubeVersion.Version) .Values.rbac.enabled .Values.rbac.psp }}
205-
securityContext:
206-
readOnlyRootFilesystem: false
207-
{{- end}}
208200
ports:
209201
- name: "{{ .Values.tcpPrefix }}bookie"
210202
containerPort: {{ .Values.bookkeeper.ports.bookie }}

0 commit comments

Comments
 (0)