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.

Sign up for GitHub

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

Jump to bottom

Removes enovyproxy-envoy, sidecar images for envoy #3514

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Removes enovyproxy-envoy, sidecar images for envoy #3514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a854a0
Removes enovyproxy-envoy, sidecar images for envoy
radixo Sep 20, 2024
39c9c82
Merge remote-tracking branch 'origin/master' into envoy-sidecar-image…
radixo Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions config/enterprise_versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,6 @@ components:
envoy:
image: tigera/envoy
version: master
envoyproxy-envoy:
image: envoyproxy/envoy
version: v1.31.0
dikastes:
image: tigera/dikastes
version: master
Expand Down
7 changes: 0 additions & 7 deletions hack/gen-versions/enterprise.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,6 @@ var (
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
}
{{- end }}
{{ with index .Components "envoyproxy-envoy" }}
ComponentEnvoyProxyEnvoy = Component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
}
{{- end }}
// Only components that correspond directly to images should be included in this list,
// Components that are only for providing a version should be left out of this list.
Expand Down
6 changes: 0 additions & 6 deletions pkg/components/enterprise.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,6 @@ var (
Image: "tigera/node-driver-registrar",
Registry: "",
}

ComponentEnvoyProxyEnvoy = Component{
Version: "v1.31.0",
Image: "envoyproxy/envoy",
Registry: "",
}
// Only components that correspond directly to images should be included in this list,
// Components that are only for providing a version should be left out of this list.
EnterpriseImages = []Component{
Expand Down
2 changes: 1 addition & 1 deletion pkg/render/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func (c *apiServerComponent) ResolveImages(is *operatorv1.ImageSet) error {
if err != nil {
errMsgs = append(errMsgs, err.Error())
}
c.l7AdmissionControllerEnvoyImage, err = components.GetReference(components.ComponentEnvoyProxyEnvoy, reg, path, prefix, is)
c.l7AdmissionControllerEnvoyImage, err = components.GetReference(components.ComponentEnvoyProxy, reg, path, prefix, is)
if err != nil {
errMsgs = append(errMsgs, err.Error())
}
Expand Down
Loading