Skip to content

[api-gateway]: Support http(s) as AppProtocol in Kubernetes svc #6616

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

Merged
merged 6 commits into from
Aug 24, 2024
Merged

[api-gateway]: Support http(s) as AppProtocol in Kubernetes svc #6616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ccb97c6
[api-gateway]: Support http, https and www-http as AppProtocol in kub…
Krast76 Aug 18, 2024
7c89915
Remove legacy www-http
Krast76 Aug 19, 2024
0538054
Fix undefined vars
Krast76 Aug 19, 2024
190b167
Add changelog
Krast76 Aug 19, 2024
6d78f3b
Fix issues found by the linter
Krast76 Aug 20, 2024
d609cdc
Fix format and add unit tests
Krast76 Aug 24, 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
1 change: 1 addition & 0 deletions changelogs/unreleased/6616-Krast76-small.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contour, support http and https as AppProtocol in k8s' services
4 changes: 4 additions & 0 deletions internal/dag/accessors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,17 @@ func validateExternalName(svc *core_v1.Service, enableExternalNameSvc bool) erro
const (
protoK8sH2C = "kubernetes.io/h2c"
protoK8sWS = "kubernetes.io/ws"
protoHTTPS = "https"
protoHTTP = "http"
)

func toContourProtocol(appProtocol string) (string, bool) {
proto, ok := map[string]string{
// *NOTE: for gateway-api: the websocket is enabled by default
protoK8sWS: "",
protoK8sH2C: "h2c",
protoHTTP: "",
protoHTTPS: "tls",
}[appProtocol]
return proto, ok
}
Expand Down
22 changes: 22 additions & 0 deletions internal/dag/accessors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@ func TestBuilderLookupService(t *testing.T) {
AppProtocol: ptr.To("kubernetes.io/wss"),
Port: 8444,
},
{
Name: "iana-https",
Protocol: "TCP",
AppProtocol: ptr.To("https"),
Port: 8445,
},
{
Name: "iana-http",
Protocol: "TCP",
AppProtocol: ptr.To("http"),
Port: 8446,
},
},
},
}
Expand Down Expand Up @@ -218,6 +230,16 @@ func TestBuilderLookupService(t *testing.T) {
port: 8444,
want: appProtcolService(appProtoService, "", 1),
},
"lookup service by port number with supported IANA app protocol: https": {
NamespacedName: types.NamespacedName{Name: appProtoService.Name, Namespace: appProtoService.Namespace},
port: 8445,
want: appProtcolService(appProtoService, "tls", 2),
},
"lookup service by port number with supported IANA app protocol: http": {
NamespacedName: types.NamespacedName{Name: appProtoService.Name, Namespace: appProtoService.Namespace},
port: 8446,
want: appProtcolService(appProtoService, "", 3),
},
}

for name, tc := range tests {
Expand Down