[template] Allow passing in a template string using RawTemplate #591
+42
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stuggi
added a commit
to stuggi/keystone-operator
that referenced
this pull request
Jan 9, 2025
…cret OverrideSecret - secret holding httpd conf snippet to override/extend the vhost endpoint config. Per endpoint vhost all files of the secret gets rendered and placed into /etc/httpd/conf/httpd_override_<key>.conf . In the httpd template at the end of the vhost those templates get included using `Include conf/httpd_override_*.conf`. For information on how sections in httpd configuration get merged, check section "How the sections are merged" in https://httpd.apache.org/docs/current/sections.html#merging Depends-On: openstack-k8s-operators/lib-common#591 Signed-off-by: Martin Schuppert <[email protected]>
stuggi
added a commit
to stuggi/keystone-operator
that referenced
this pull request
Jan 10, 2025
…iceConfigSecret This change allows to customize the httpd vhost config using this parameter to specify a secret that contains service config data. The content of each provided snippet gets rendered as a go template and placed into /etc/httpd/conf/httpd_custom_<endpoint>_<key> . At the end of the vhost config in the default httpd template these custom configs get included using `Include conf/httpd_custom_<endpoint>_*`. For information on how sections in httpd configuration get merged, check section "How the sections are merged" in https://httpd.apache.org/docs/current/sections.html#merging Depends-On: openstack-k8s-operators/lib-common#591 Signed-off-by: Martin Schuppert <[email protected]>
olliewalsh
reviewed
Jan 10, 2025
modules/common/util/template_util.go
Outdated
| for filename, tmplData := range t.AdditionalTemplate { | ||
| var renderedTemplate string | ||
| var err error | ||
| // if tmplData contains either new lines or spaces its expected |
There was a problem hiding this comment.
seems very fragile, e.g spaces are valid in file paths.
Could add a new field instead of re-using AdditionalTemplate?
There was a problem hiding this comment.
could do that, but I hope we are not using spaces in our templates which are part of our operator images
There was a problem hiding this comment.
@olliewalsh changed and introduced a new field RawTemplate . If you can think of a better naming, let me know :)
stuggi
force-pushed
the
template_string
branch
from
5941b19 to
df5302f
Compare
stuggi
changed the title
Right all templates are expected to be local files. This change allows passing in optional templates via RawTemplate where the template is a full templace string. Signed-off-by: Martin Schuppert <[email protected]>
stuggi
force-pushed
the
template_string
branch
from
df5302f to
f4bf5c3
Compare
stuggi
added a commit
to stuggi/keystone-operator
that referenced
this pull request
Jan 10, 2025
…iceConfigSecret This change allows to customize the httpd vhost config using this parameter to specify a secret that contains service config data. The content of each provided snippet gets rendered as a go template and placed into /etc/httpd/conf/httpd_custom_<endpoint>_<key> . At the end of the vhost config in the default httpd template these custom configs get included using `Include conf/httpd_custom_<endpoint>_*`. For information on how sections in httpd configuration get merged, check section "How the sections are merged" in https://httpd.apache.org/docs/current/sections.html#merging Depends-On: openstack-k8s-operators/lib-common#591 Signed-off-by: Martin Schuppert <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Right all templates are expected to be local files.
This change allows passing in optional templates via
RawTemplatewhere the template is a full template string.