Merge upstream

.ci/chart_test.sh

@@ -27,27 +27,69 @@ VALUES_FILE=$1
 TLS=${TLS:-"false"}
 SYMMETRIC=${SYMMETRIC:-"false"}
 FUNCTION=${FUNCTION:-"false"}
+MANAGER=${MANAGER:-"false"}
 
 source ${PULSAR_HOME}/.ci/helm.sh
 
 # create cluster
 ci::create_cluster
 
+ci::helm_repo_add
+
 extra_opts=""
 if [[ "x${SYMMETRIC}" == "xtrue" ]]; then
     extra_opts="-s"
 fi
 
-# install pulsar chart
-ci::install_pulsar_chart ${PULSAR_HOME}/${VALUES_FILE} ${extra_opts}
+if [[ "x${EXTRA_SUPERUSERS}" != "x" ]]; then
+    extra_opts="${extra_opts} --pulsar-superusers proxy-admin,broker-admin,admin,${EXTRA_SUPERUSERS}"
+fi
+
+install_type="install"
+test_action="produce-consume"
+if [[ "$UPGRADE_FROM_VERSION" != "" ]]; then
+    # install older version of pulsar chart
+    PULSAR_CHART_VERSION="$UPGRADE_FROM_VERSION"
+    ci::install_pulsar_chart install ${PULSAR_HOME}/.ci/values-common.yaml ${PULSAR_HOME}/${VALUES_FILE} ${extra_opts}    
+    install_type="upgrade"
+    echo "Wait 10 seconds"
+    sleep 10
+    # test that we can access the admin api
+    ci::test_pulsar_admin_api_access
+    # produce messages with old version of pulsar and consume with new version
+    ci::test_pulsar_producer_consumer "produce"
+    test_action="consume"
+
+    if [[ "$(ci::helm_values_for_deployment | yq .kube-prometheus-stack.enabled)" == "true" ]]; then
+        echo "Upgrade Prometheus Operator CRDs before upgrading the deployment"
+        ${PULSAR_HOME}/scripts/kube-prometheus-stack/upgrade_prometheus_operator_crds.sh
+    fi
+fi
+
+PULSAR_CHART_VERSION="local"
+# install (or upgrade) pulsar chart
+ci::install_pulsar_chart ${install_type} ${PULSAR_HOME}/.ci/values-common.yaml ${PULSAR_HOME}/${VALUES_FILE} ${extra_opts}
+
+echo "Wait 10 seconds"
+sleep 10
+
+# check pulsar environment
+ci::check_pulsar_environment
 
+# test that we can access the admin api
+ci::test_pulsar_admin_api_access
 # test producer/consumer
-ci::test_pulsar_producer_consumer
+ci::test_pulsar_producer_consumer "${test_action}"
 
-if [[ "x${FUNCTION}" == "xtrue" ]]; then
-    # install cert manager
+if [[ "$(ci::helm_values_for_deployment | yq .components.functions)" == "true" ]]; then
+    # test functions
     ci::test_pulsar_function
 fi
 
+if [[ "$(ci::helm_values_for_deployment | yq .components.pulsar_manager)" == "true" ]]; then
+    # test manager
+    ci::test_pulsar_manager
+fi
+
 # delete the cluster
 ci::delete_cluster

.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

.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

.ci/clusters/values-jwt-asymmetric.yaml

@@ -17,70 +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:
@@ -100,3 +36,9 @@ auth:
     proxy: "proxy-admin"
     # pulsar-admin client to broker/proxy communication
     client: "admin"
+    # pulsar-manager to broker communication
+    manager: "manager-admin"
+
+components:
+  pulsar_manager: true
+

.ci/clusters/values-jwt-symmetric.yaml

@@ -17,70 +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:
@@ -100,3 +36,8 @@ auth:
     proxy: "proxy-admin"
     # pulsar-admin client to broker/proxy communication
     client: "admin"
+    # pulsar manager to broker
+    manager: "manager-admin"
+
+components:
+  pulsar_manager: true