Helm: fix egress-dicovery netpols #11838
Merged
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
Signed-off-by: QuantumEnigmaa <[email protected]>
Signed-off-by: QuantumEnigmaa <[email protected]>
Signed-off-by: QuantumEnigmaa <[email protected]>
QuantumEnigmaa
force-pushed
the
fix-netpols
branch
from
fae0e1b
to
6fcf4c1
Compare
|
Nice finding |
|
@MichelHollands would you have the time to review this PR? |
|
Hey @JStickler do you know if another maintainer could help us get this merged? This is blocking us at the moment and the change looks quite small :) |
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
**What this PR does / why we need it**: This PR fix an issue happening when deploying the `egress-discovery` networkPolicy or ciliumNetworkPolicy. When one wants to deploy the `egress-discovery` netpol, one only has to specify the `networkPolicy.discovery.port` field in the values. However, with the current state of the templates, when this field is specified, **both** the networkPolicy and the ciliumNetworkPolicy are generated since the only condition for their creation is `if .Values.networkPolicy.discovery.port`. I thus added an additional condition : `eq .Values.networkPolicy.flavor "cilium"` (or `"kubernetes"` for the networkPolicy) so that only one of these is generated according to the `flavor` specified in the values. **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [ ] Tests updated - [x] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [x] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](grafana@d10549e) - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](grafana@0d4416a) --------- Signed-off-by: QuantumEnigmaa <[email protected]> Co-authored-by: Michel Hollands <[email protected]>
mraboosk
pushed a commit
to mraboosk/loki
that referenced
this pull request
Oct 7, 2024
**What this PR does / why we need it**: This PR fix an issue happening when deploying the `egress-discovery` networkPolicy or ciliumNetworkPolicy. When one wants to deploy the `egress-discovery` netpol, one only has to specify the `networkPolicy.discovery.port` field in the values. However, with the current state of the templates, when this field is specified, **both** the networkPolicy and the ciliumNetworkPolicy are generated since the only condition for their creation is `if .Values.networkPolicy.discovery.port`. I thus added an additional condition : `eq .Values.networkPolicy.flavor "cilium"` (or `"kubernetes"` for the networkPolicy) so that only one of these is generated according to the `flavor` specified in the values. **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [ ] Tests updated - [x] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [x] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](grafana@2cef71e) - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](grafana@0d4416a) --------- Signed-off-by: QuantumEnigmaa <[email protected]> Co-authored-by: Michel Hollands <[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.
What this PR does / why we need it:
This PR fix an issue happening when deploying the
egress-discoverynetworkPolicy or ciliumNetworkPolicy. When one wants to deploy theegress-discoverynetpol, one only has to specify thenetworkPolicy.discovery.portfield in the values. However, with the current state of the templates, when this field is specified, both the networkPolicy and the ciliumNetworkPolicy are generated since the only condition for their creation isif .Values.networkPolicy.discovery.port.I thus added an additional condition :
eq .Values.networkPolicy.flavor "cilium"(or"kubernetes"for the networkPolicy) so that only one of these is generated according to theflavorspecified in the values.Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)CHANGELOG.mdupdatedadd-to-release-noteslabeldocs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR