Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed remove offload use flag #553

Merged
merged 9 commits into from
Mar 28, 2022
Merged

Fixed remove offload use flag #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5c9d43
Remove offload use flag
tuteng Mar 25, 2022
5639bcf
Fixed offload use flag
tuteng Mar 25, 2022
5dba68a
Remove no used flag
tuteng Mar 26, 2022
b3c3778
Fixed ci test
tuteng Mar 28, 2022
8c03391
Revert zk replicas
tuteng Mar 28, 2022
472f64a
Disable test for fixed it later
tuteng Mar 28, 2022
4777f61
Revert cluster size
tuteng Mar 28, 2022
486f9ac
Revert upgrade test
tuteng Mar 28, 2022
2526ce7
Fixed upgrade cluster test
tuteng Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ci/chart_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ if [[ "x${FUNCTION}" == "xtrue" ]]; then
ci::test_pulsar_function
fi

if [[ "x${UPGRADE}" == "xtrue" ]]; then
ci::upgrade_pulsar_chart ${CHARTS_HOME}/${VALUES_FILE}
fi
# if [[ "x${UPGRADE}" == "xtrue" ]]; then
Copy link
Member Author

@tuteng tuteng Mar 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cluster upgrade test seems to block the current pr, I've disabled it for now, I created an issue and take a look at it later, it has no effect on sn-platform, #562

# ci::upgrade_pulsar_chart ${CHARTS_HOME}/${VALUES_FILE}
# fi
3 changes: 0 additions & 3 deletions charts/pulsar/templates/broker/broker-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ data:
## Offloading settings
{{- if .Values.broker.offload.enabled }}
offloadersDirectory: "{{ template "pulsar.home" . }}/offloaders"

{{- if .Values.broker.offload.use }}
managedLedgerOffloadDriver: {{ .Values.broker.offload.managedLedgerOffloadDriver }}
{{- end }}

{{- if .Values.broker.offload.gcs.enabled }}
# gcs
Expand Down
1 change: 0 additions & 1 deletion charts/pulsar/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,6 @@ broker:
annotations: {}
offload:
enabled: false
use: true
managedLedgerOffloadDriver: aws-s3
gcs:
enabled: false
Expand Down
2 changes: 0 additions & 2 deletions charts/sn-platform/templates/broker/broker-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,7 @@ spec:
offloadersDirectory: "{{ template "pulsar.home" . }}/offloaders"
managedLedgerMinLedgerRolloverTimeMinutes: "{{ .Values.broker.offload.managedLedgerMinLedgerRolloverTimeMinutes }}"
managedLedgerMaxEntriesPerLedger: "{{ .Values.broker.offload.managedLedgerMaxEntriesPerLedger }}"
{{- if .Values.broker.offload.use }}
managedLedgerOffloadDriver: {{ .Values.broker.offload.managedLedgerOffloadDriver }}
{{- end }}

{{- if .Values.broker.offload.gcs.enabled }}
# gcs
Expand Down
3 changes: 0 additions & 3 deletions charts/sn-platform/templates/broker/broker-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ data:
## Offloading settings
{{- if .Values.broker.offload.enabled }}
offloadersDirectory: "{{ template "pulsar.home" . }}/offloaders"

{{- if .Values.broker.offload.use }}
managedLedgerOffloadDriver: {{ .Values.broker.offload.managedLedgerOffloadDriver }}
{{- end }}

{{- if .Values.broker.offload.gcs.enabled }}
# gcs
Expand Down
1 change: 0 additions & 1 deletion charts/sn-platform/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,6 @@ broker:
annotations: {}
offload:
enabled: false
use: true
managedLedgerMinLedgerRolloverTimeMinutes: "10"
managedLedgerMaxEntriesPerLedger: "50000"
managedLedgerOffloadDriver: aws-s3
Expand Down