Skip to content

HDDS-15232. Reduce duplication in ozonesecure env#10239

Merged
dombizita merged 2 commits into
apache:masterfrom
adoroszlai:HDDS-15232
May 13, 2026
Merged

HDDS-15232. Reduce duplication in ozonesecure env#10239
dombizita merged 2 commits into
apache:masterfrom
adoroszlai:HDDS-15232

Conversation

@adoroszlai
Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

Reduce duplication in non-HA secure docker-compose environments:

  • merge ozonesecure-mr into ozonesecure
  • utilize reusable YAML fragments in ozonesecure

https://issues.apache.org/jira/browse/HDDS-15232

How was this patch tested?

https://github.com/adoroszlai/ozone/actions/runs/25675964314

ozonesecure/test-hadoop.sh passed in:
https://github.com/adoroszlai/ozone/actions/runs/25675964314/job/75379224808

@adoroszlai adoroszlai self-assigned this May 11, 2026
Copy link
Copy Markdown
Contributor

@priyeshkaratha priyeshkaratha left a comment

Choose a reason for hiding this comment

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

Thanks @adoroszlai for the patch. Please check the inline comment?

- ../_keytabs:/etc/security/keytabs
- ./krb5.conf:/etc/krb5.conf
env_file:
- docker-config
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is it recommended ./docker-config or docker-config?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

./ is required for volumes in the current directory ("to avoid ambiguities with named volumes, relative paths should always begin with . or .."). There is no such ambiguity with env_file, so the form docker-config is recommended for simplicity.

https://docs.docker.com/reference/compose-file/services/

Copy link
Copy Markdown
Contributor

@priyeshkaratha priyeshkaratha left a comment

Choose a reason for hiding this comment

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

Changes LGTM

@adoroszlai adoroszlai requested review from dombizita and errose28 May 12, 2026 08:18
Copy link
Copy Markdown
Contributor

@dombizita dombizita left a comment

Choose a reason for hiding this comment

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

Thanks for working on this @adoroszlai, I have two small questions about merging ozonesecure-mr into ozonesecure, otherwise it looks good to me!

Comment thread hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
Comment thread hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
Copy link
Copy Markdown
Contributor

@dombizita dombizita left a comment

Choose a reason for hiding this comment

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

Thank you for the answers, all makes sense!

@dombizita dombizita merged commit b8ef0d6 into apache:master May 13, 2026
33 checks passed
@dombizita
Copy link
Copy Markdown
Contributor

Thanks for working on this @adoroszlai, thank you for the review @priyeshkaratha!

@adoroszlai adoroszlai deleted the HDDS-15232 branch May 13, 2026 07:18
@adoroszlai
Copy link
Copy Markdown
Contributor Author

Thanks @dombizita, @priyeshkaratha for the review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants