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.

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

fix: drop path normalization to MERGE_SLASHES to allow apps to handle encoded slashes #330

Merged
merged 16 commits into from
Apr 11, 2024
Merged
2 changes: 1 addition & 1 deletion src/istio/values/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
meshConfig:
accessLogFile: /dev/stdout
pathNormalization:
normalization: DECODE_AND_MERGE_SLASHES
normalization: MERGE_SLASHES
defaultConfig:
holdApplicationUntilProxyStarts: true
gatewayTopology:
Expand Down
4 changes: 2 additions & 2 deletions src/pepr/operator/controllers/istio/injection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export async function enableInjection(pkg: UDSPackage) {
const annotations = sourceNS.metadata?.annotations || {};
const pkgKey = `uds.dev/pkg-${pkg.metadata.name}`;

// Save the original value of the istio-injection label only if it's not already set
if (!annotations[injectionLabel]) {
// Mark the original namespace injection setting for if all packages are removed
if (!annotations[injectionAnnotation]) {
annotations[injectionAnnotation] = labels[injectionLabel] || "non-existent";
}

Expand Down