fix: Use quoted values zone annotation in topology injector

[jukie]

What type of PR is this?

fix: fix integer zone values for topology injector

What this PR does / why we need it:
Injects quotations to the zone annotation value to ensure the rendered bootstrap config always results in a quoted string.

Which issue(s) this PR fixes:

Fixes #6117

Release Notes: Yes

[jukie]

Hey @dghubble could you try an image based on this commit in your environment? I'm still unable to reproduce your issue but this forcefully injects quotes to the zone annotation value so am curious to see if this resolves things for you.
I've pushed to docker.io/jukie/gateway-dev:quoted-zone-value (re-pushed after recent commits up to afb15b2) for convenience but you can also build manually from my branch via running the following in the cloned directory:
make go.build.linux_amd64.envoy-gateway && make go.build.linux_arm64.envoy-gateway && REGISTRY=your-registry TAG=some-tag make image.push.multiarch

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.58%. Comparing base (71d2f7d) to head (5ab54b1).
Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6133      +/-   ##
==========================================
- Coverage   70.60%   70.58%   -0.02%     
==========================================
  Files         219      219              
  Lines       36514    36514              
==========================================
- Hits        25781    25775       -6     
- Misses       9203     9208       +5     
- Partials     1530     1531       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[owenhaynes]

Is this what is causing the following error?

"error": "failed to create or update deployment envoy-gateway-system/...   failed to create/update resource with server-side apply for obj  ...  \"...\" is invalid: [spec.template.spec.containers[0].env[0].valueFrom: Invalid value: \"\": may not be specified when `value` is not empty, spec.template.spec.containers[1].env[0].valueFrom: Invalid value: \"\": may not be specified when `value` is not empty]

Have this with the topology injector on and off

[jukie]

@owenhaynes could you share more info in #6117? Including the rendered pod yaml would be useful

[arkodg]

hey curious what the annotation on envoy proxy looks like for the 0 case with kind ?

[jukie]

In kind at v1.4.0:

apiVersion: v1
kind: Pod
metadata:
  annotations:
    topology.kubernetes.io/zone: "0"

Both annotations and labels are map[string]string so the value can't be set to integer. I've been trying to deduce where else the parsing issue could be but my PR injects an additional set of quotations to hopefully avoid that.

apiVersion: v1
kind: Pod
metadata:
  annotations:
    topology.kubernetes.io/zone: '"0"'

[jukie]

/retest

[jukie]

/retest

[arkodg]

LGTM thanks !

[zirain]

'"0"' seems incorrect than "0"

[jukie]

I'd agree and the only reason this is being added is to address parsing edge cases reported in #6117

I've still been unable to reproduce the reported issues there so I'd suggest waiting to merge this until @dghubble is able to add some more context or someone else is able to pinpoint where the problem is.

[zirain]

Yeah, #6133 (comment) seems should be another issue.

[jukie]

Yup @owenhaynes opened a separate issue and already identified the bug there - #6117 (comment)

It's unrelated to zone aware routing

[jukie]

/retest