Skip to content

[docker] Do not apply env values to pulsar_env.sh and bkenv.sh implicitly - #6579

Merged
sijie merged 1 commit into
apache:masterfrom
fantapsody:fix-apply-config-from-env
Mar 26, 2020
Merged

[docker] Do not apply env values to pulsar_env.sh and bkenv.sh implicitly#6579
sijie merged 1 commit into
apache:masterfrom
fantapsody:fix-apply-config-from-env

Conversation

@fantapsody

Copy link
Copy Markdown
Contributor

Motivation

The script apply-config-from-env.py always applies env config to env scripts. However, with the changes from #4105 and #5892, it seems there is no need to do so anymore. On the other hand, it will interfere with the bash variable replacement mechanisms by replacing the values in scripts directly.

Modifications

Remove ['conf/pulsar_env.sh', 'conf/bkenv.sh'] from conf_files.

…citly when running apply-config-from-env.py.
@jiazhai
jiazhai requested review from merlimat, sijie and wolfstudy March 22, 2020 02:56
@jiazhai

jiazhai commented Mar 22, 2020

Copy link
Copy Markdown
Member

Thanks @fantapsody for the work.
@cckellogg Would you please also take a look at this change?

@jiazhai

jiazhai commented Mar 22, 2020

Copy link
Copy Markdown
Member

/pulsarbot run-failure-checks

@cckellogg

Copy link
Copy Markdown
Contributor

Seems fine to me. I would double check kubernetes files and helm charts to make sure this does not accidentally break something.

@sijie sijie added this to the 2.6.0 milestone Mar 23, 2020
@jiazhai

jiazhai commented Mar 23, 2020

Copy link
Copy Markdown
Member

/pulsarbot run-failure-checks

1 similar comment
@sijie

sijie commented Mar 25, 2020

Copy link
Copy Markdown
Member

/pulsarbot run-failure-checks

@sijie
sijie merged commit ed80a93 into apache:master Mar 26, 2020
@fantapsody
fantapsody deleted the fix-apply-config-from-env branch March 26, 2020 11:11
codelipenghui added a commit to codelipenghui/incubator-pulsar that referenced this pull request Jun 15, 2020
huangdx0726 pushed a commit to huangdx0726/pulsar that referenced this pull request Aug 24, 2020
lhotari added a commit to lhotari/datastax-pulsar-helm-chart that referenced this pull request Mar 21, 2022
- this is obsolete after apache/pulsar#6579, apache/pulsar#4105 and apache/pulsar#5892
  changes. apply-config-from-env.py doesn't properly handle replacements for shell scripts
lhotari added a commit to datastax/pulsar-helm-chart that referenced this pull request Mar 21, 2022
…163)

- this is obsolete after apache/pulsar#6579, apache/pulsar#4105 and apache/pulsar#5892
  changes. apply-config-from-env.py doesn't properly handle replacements for shell scripts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants