Redo v1.15.1 release again #85
Merged
+37
−56
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
michi-covalent
force-pushed
the
pr/v1.15.1
branch
2 times, most recently
from
1f68bfa to
46c8407
Compare
Signed-off-by: Michi Mutsuzaki <[email protected]>
cilium/cilium#19565 removed hubble-ui-proxy from the Helm chart. Remove all the references to hubble-ui-proxy in the OLM templates. Signed-off-by: Michi Mutsuzaki <[email protected]>
afcb36d didn't quite work because it missed a couple of places that referenced clustermeshEtcdImage. Use the same pattern as f2f792f to conditionally include quay.io/coreos/etcd in the related image list depending on Cilium version. Fixes: afcb36d ("Exclude quay.io/coreos/etcd for Cilium >=v1.15") Signed-off-by: Michi Mutsuzaki <[email protected]>
Signed-off-by: Michi Mutsuzaki <[email protected]>
michi-covalent
force-pushed
the
pr/v1.15.1
branch
from
46c8407 to
aeaa0e8
Compare
michi-covalent
commented
Feb 19, 2024
| // quay.io/coreos/etcd is not included in Cilium >= 1.15 Helm charts. | ||
| // Ref: https://github.com/cilium/cilium/blob/v1.15.1/install/kubernetes/cilium/values.yaml | ||
| if strings.HasPrefix(parameters.ciliumVersion, "1.12") || strings.HasPrefix(parameters.ciliumVersion, "1.13") || strings.HasPrefix(parameters.ciliumVersion, "1.14") { | ||
| _related_images: _related_images + [{ |
There was a problem hiding this comment.
this didn't work, i guess cue doesn't allow mutating lists, i got this error: cue: marshal error: template.items.14.spec.relatedImages: cycle detected
| }] | ||
|
|
||
| if parameters.hubbleUIProxyImage != "nothing" { | ||
| _related_images_env_vars: _related_images_env_vars + [{ |
michi-covalent
commented
Feb 19, 2024
| @@ -24,7 +24,7 @@ spec: | |||
| clusterPoolIPv4PodCIDRList: | |||
| - "10.128.0.0/14" | |||
| clusterPoolIPv4MaskSize: "23" | |||
| nativeRoutingCIDR: "10.128.0.0/14" | |||
| ipv4NativeRoutingCIDR: "10.128.0.0/14" | |||
There was a problem hiding this comment.
ipv4NativeRoutingCIDR is the correct setting: https://docs.cilium.io/en/stable/helm-reference/ not sure where i initially got nativeRoutingCIDR from.
There was a problem hiding this comment.
nativeRoutingCIDR has been deprecated and removed see #74
There was a problem hiding this comment.
oh yeah i guess i made the prior PR before #74 💡
fgiloux
approved these changes
Feb 20, 2024
| @@ -24,7 +24,7 @@ spec: | |||
| clusterPoolIPv4PodCIDRList: | |||
| - "10.128.0.0/14" | |||
| clusterPoolIPv4MaskSize: "23" | |||
| nativeRoutingCIDR: "10.128.0.0/14" | |||
| ipv4NativeRoutingCIDR: "10.128.0.0/14" | |||
There was a problem hiding this comment.
nativeRoutingCIDR has been deprecated and removed see #74
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.
#84 didn't work. please review 8f2c895 🚀🙏
✅ manually tested with v1.15.1 and v1.14.7.