This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 14c048e Share common parts of the values files used in CI (#415)
14c048e is described below
commit 14c048ee72e98b875f680ab22d4150d911f23c89
Author: Lari Hotari <[email protected]>
AuthorDate: Thu Dec 21 17:43:25 2023 +0200
Share common parts of the values files used in CI (#415)
* Share common parts of the values files used in CI
* Fix ct-lint
---
.ci/chart_test.sh | 2 +-
.ci/{chart_test.sh => clusters/values-basic.yaml} | 34 ---------
.ci/clusters/values-bk-tls.yaml | 65 -----------------
.ci/clusters/values-broker-tls.yaml | 65 -----------------
.ci/clusters/values-jwt-asymmetric.yaml | 65 -----------------
.ci/clusters/values-jwt-symmetric.yaml | 65 -----------------
.ci/clusters/values-local-pv.yaml | 83 ----------------------
.ci/clusters/values-psp.yaml | 65 -----------------
.ci/clusters/values-pulsar-image.yaml | 68 +-----------------
.ci/clusters/values-tls.yaml | 65 -----------------
.ci/clusters/values-zk-tls.yaml | 65 -----------------
.ci/clusters/values-zkbk-tls.yaml | 65 -----------------
.ci/helm.sh | 11 +--
.../values-function.yaml => values-common.yaml} | 2 +-
.github/workflows/pulsar-helm-chart-ci.yaml | 15 ++--
15 files changed, 16 insertions(+), 719 deletions(-)
diff --git a/.ci/chart_test.sh b/.ci/chart_test.sh
index 43bfa89..8c897dd 100755
--- a/.ci/chart_test.sh
+++ b/.ci/chart_test.sh
@@ -39,7 +39,7 @@ if [[ "x${SYMMETRIC}" == "xtrue" ]]; then
fi
# install pulsar chart
-ci::install_pulsar_chart ${PULSAR_HOME}/${VALUES_FILE} ${extra_opts}
+ci::install_pulsar_chart ${PULSAR_HOME}/.ci/values-common.yaml
${PULSAR_HOME}/${VALUES_FILE} ${extra_opts}
# test producer/consumer
ci::test_pulsar_producer_consumer
diff --git a/.ci/chart_test.sh b/.ci/clusters/values-basic.yaml
old mode 100755
new mode 100644
similarity index 53%
copy from .ci/chart_test.sh
copy to .ci/clusters/values-basic.yaml
index 43bfa89..d8a500d
--- a/.ci/chart_test.sh
+++ b/.ci/clusters/values-basic.yaml
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,36 +17,3 @@
# under the License.
#
-set -e
-
-
-BINDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-PULSAR_HOME="$(cd "${BINDIR}/.." && pwd)"
-VALUES_FILE=$1
-TLS=${TLS:-"false"}
-SYMMETRIC=${SYMMETRIC:-"false"}
-FUNCTION=${FUNCTION:-"false"}
-
-source ${PULSAR_HOME}/.ci/helm.sh
-
-# create cluster
-ci::create_cluster
-
-extra_opts=""
-if [[ "x${SYMMETRIC}" == "xtrue" ]]; then
- extra_opts="-s"
-fi
-
-# install pulsar chart
-ci::install_pulsar_chart ${PULSAR_HOME}/${VALUES_FILE} ${extra_opts}
-
-# test producer/consumer
-ci::test_pulsar_producer_consumer
-
-if [[ "x${FUNCTION}" == "xtrue" ]]; then
- # install cert manager
- ci::test_pulsar_function
-fi
-
-# delete the cluster
-ci::delete_cluster
diff --git a/.ci/clusters/values-bk-tls.yaml b/.ci/clusters/values-bk-tls.yaml
index 224c0ad..8d09646 100644
--- a/.ci/clusters/values-bk-tls.yaml
+++ b/.ci/clusters/values-bk-tls.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
# enable TLS
tls:
enabled: true
diff --git a/.ci/clusters/values-broker-tls.yaml
b/.ci/clusters/values-broker-tls.yaml
index d3922fa..7b7a3e4 100644
--- a/.ci/clusters/values-broker-tls.yaml
+++ b/.ci/clusters/values-broker-tls.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
# enable TLS
tls:
enabled: true
diff --git a/.ci/clusters/values-jwt-asymmetric.yaml
b/.ci/clusters/values-jwt-asymmetric.yaml
index 4b07f83..13344f0 100644
--- a/.ci/clusters/values-jwt-asymmetric.yaml
+++ b/.ci/clusters/values-jwt-asymmetric.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 2
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
auth:
authentication:
enabled: true
diff --git a/.ci/clusters/values-jwt-symmetric.yaml
b/.ci/clusters/values-jwt-symmetric.yaml
index 1d2978b..76faf73 100644
--- a/.ci/clusters/values-jwt-symmetric.yaml
+++ b/.ci/clusters/values-jwt-symmetric.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
auth:
authentication:
enabled: true
diff --git a/.ci/clusters/values-local-pv.yaml
b/.ci/clusters/values-local-pv.yaml
deleted file mode 100644
index f119b32..0000000
--- a/.ci/clusters/values-local-pv.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
diff --git a/.ci/clusters/values-psp.yaml b/.ci/clusters/values-psp.yaml
index 51f2c67..493455e 100644
--- a/.ci/clusters/values-psp.yaml
+++ b/.ci/clusters/values-psp.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 2
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
rbac:
enabled: true
psp: true
diff --git a/.ci/clusters/values-pulsar-image.yaml
b/.ci/clusters/values-pulsar-image.yaml
index 3963f3e..f47972f 100644
--- a/.ci/clusters/values-pulsar-image.yaml
+++ b/.ci/clusters/values-pulsar-image.yaml
@@ -17,70 +17,4 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-volumes:
- persistence: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
\ No newline at end of file
+defaultPulsarImageTag: 3.1.1
\ No newline at end of file
diff --git a/.ci/clusters/values-tls.yaml b/.ci/clusters/values-tls.yaml
index 66ae54a..66ead80 100644
--- a/.ci/clusters/values-tls.yaml
+++ b/.ci/clusters/values-tls.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
# enable TLS
tls:
enabled: true
diff --git a/.ci/clusters/values-zk-tls.yaml b/.ci/clusters/values-zk-tls.yaml
index a3412c7..d7ce81c 100644
--- a/.ci/clusters/values-zk-tls.yaml
+++ b/.ci/clusters/values-zk-tls.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
# enable TLS
tls:
enabled: true
diff --git a/.ci/clusters/values-zkbk-tls.yaml
b/.ci/clusters/values-zkbk-tls.yaml
index b00b78d..ac0bd22 100644
--- a/.ci/clusters/values-zkbk-tls.yaml
+++ b/.ci/clusters/values-zkbk-tls.yaml
@@ -17,71 +17,6 @@
# under the License.
#
-kube-prometheus-stack:
- enabled: false
- prometheusOperator:
- enabled: false
- grafana:
- enabled: false
- alertmanager:
- enabled: false
- prometheus:
- enabled: false
-
-# disabled AntiAffinity
-affinity:
- anti_affinity: false
-
-# disable auto recovery and pulsar manager
-components:
- autorecovery: false
- pulsar_manager: false
-
-zookeeper:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-bookkeeper:
- replicaCount: 3
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- diskUsageThreshold: "0.999"
- diskUsageWarnThreshold: "0.999"
- PULSAR_PREFIX_diskUsageThreshold: "0.999"
- PULSAR_PREFIX_diskUsageWarnThreshold: "0.999"
-
-broker:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
- configData:
- ## Enable `autoSkipNonRecoverableData` since bookkeeper is running
- ## without persistence
- autoSkipNonRecoverableData: "true"
- # storage settings
- managedLedgerDefaultEnsembleSize: "1"
- managedLedgerDefaultWriteQuorum: "1"
- managedLedgerDefaultAckQuorum: "1"
-
-autorecovery:
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-proxy:
- replicaCount: 1
- # Disable pod monitor since we're disabling CRD installation
- podMonitor:
- enabled: false
-
-toolset:
- useProxy: false
-
# enable TLS
tls:
enabled: true
diff --git a/.ci/helm.sh b/.ci/helm.sh
index ba964b7..3284b0f 100644
--- a/.ci/helm.sh
+++ b/.ci/helm.sh
@@ -100,8 +100,9 @@ function ci::collect_k8s_logs() {
}
function ci::install_pulsar_chart() {
- local value_file=$1
- local extra_opts=$2
+ local common_value_file=$1
+ local value_file=$2
+ local extra_opts=$3
echo "Installing the pulsar chart"
${KUBECTL} create namespace ${NAMESPACE}
@@ -112,9 +113,9 @@ function ci::install_pulsar_chart() {
echo ${HELM} dependency update ${CHARTS_HOME}/charts/pulsar
${HELM} dependency update ${CHARTS_HOME}/charts/pulsar
- echo ${HELM} install --set initialize=true --values ${value_file}
${CLUSTER} ${CHARTS_HOME}/charts/pulsar
- ${HELM} template --values ${value_file} ${CLUSTER}
${CHARTS_HOME}/charts/pulsar
- ${HELM} install --set initialize=true --values ${value_file}
--namespace=${NAMESPACE} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar
+ echo ${HELM} install --set initialize=true --values ${common_value_file}
--values ${value_file} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar
+ ${HELM} template --values ${common_value_file} --values ${value_file}
${CLUSTER} ${CHARTS_HOME}/charts/pulsar
+ ${HELM} install --set initialize=true --values ${common_value_file}
--values ${value_file} --namespace=${NAMESPACE} ${CLUSTER}
${CHARTS_HOME}/charts/pulsar
echo "wait until broker is alive"
WC=$(${KUBECTL} get pods -n ${NAMESPACE}
--field-selector=status.phase=Running | grep ${CLUSTER}-broker | wc -l)
diff --git a/.ci/clusters/values-function.yaml b/.ci/values-common.yaml
similarity index 99%
rename from .ci/clusters/values-function.yaml
rename to .ci/values-common.yaml
index 51c6956..c7e3b70 100644
--- a/.ci/clusters/values-function.yaml
+++ b/.ci/values-common.yaml
@@ -70,7 +70,7 @@ broker:
PF_functionInstanceMinResources_cpu: "0.2"
PF_functionInstanceMinResources_ram: "268435456"
PF_functionInstanceMinResources_disk: "268435456"
-
+
autorecovery:
# Disable pod monitor since we're disabling CRD installation
podMonitor:
diff --git a/.github/workflows/pulsar-helm-chart-ci.yaml
b/.github/workflows/pulsar-helm-chart-ci.yaml
index b880895..ee35a95 100644
--- a/.github/workflows/pulsar-helm-chart-ci.yaml
+++ b/.github/workflows/pulsar-helm-chart-ci.yaml
@@ -37,7 +37,7 @@ jobs:
steps:
- name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Detect changed files
id: changes
@@ -69,7 +69,7 @@ jobs:
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Check license
run: |
@@ -86,7 +86,9 @@ jobs:
no_chart_changes: ${{ steps.ct-lint.outputs.no_chart_changes }}
steps:
- name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
@@ -157,11 +159,8 @@ jobs:
kind_image_tag:
v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
testScenario:
- name: Basic
- values_file: .ci/clusters/values-local-pv.yaml
+ values_file: .ci/clusters/values-basic.yaml
shortname: basic
- - name: Pulsar Function
- values_file: .ci/clusters/values-function.yaml
- shortname: function
- name: Use Pulsar Image
values_file: .ci/clusters/values-pulsar-image.yaml
shortname: pulsar-image
@@ -194,7 +193,7 @@ jobs:
KUBECTL_VERSION: ${{ matrix.k8sVersion.version }}
steps:
- name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
