DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 33 Packages Projects Releases 1 Wiki Activity

fix main port rename for common unit-tests

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-05-22 23:13:08 +02:00
parent 0968aa7e2e
commit 645673f04a
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -19,4 +19,4 @@ name: common
sources: sources:
- https://github.com/truecharts/apps/tree/master/library/common - https://github.com/truecharts/apps/tree/master/library/common
type: library type: library
version: 4.1.2 version: 4.1.3
charts/library/common/tests/container_test.go
+4 -4
View File
@@ -203,11 +203,11 @@ func (suite *ContainerTestSuite) TestPorts() {
expectedPort int expectedPort int
expectedProtocol string expectedProtocol string
}{ }{
"Default": {values: nil, expectedPortName: "http", expectedPort: 0, expectedProtocol: "TCP"}, "Default": {values: nil, expectedPortName: "main", expectedPort: 0, expectedProtocol: "TCP"},
"CustomName": {values: []string{"service.main.ports.http.enabled=false", "service.main.ports.server.enabled=true", "service.main.ports.server.port=8080"}, expectedPortName: "server", expectedPort: 8080, expectedProtocol: "TCP"}, "CustomName": {values: []string{"service.main.ports.http.enabled=false", "service.main.ports.server.enabled=true", "service.main.ports.server.port=8080"}, expectedPortName: "server", expectedPort: 8080, expectedProtocol: "TCP"},
"ProtocolHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedPortName: "http", expectedPort: 0, expectedProtocol: "TCP"}, "ProtocolHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedPortName: "main", expectedPort: 0, expectedProtocol: "TCP"},
"ProtocolHTTPS": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedPortName: "http", expectedPort: 0, expectedProtocol: "TCP"}, "ProtocolHTTPS": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedPortName: "main", expectedPort: 0, expectedProtocol: "TCP"},
"ProtocolUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedPortName: "http", expectedPort: 0, expectedProtocol: "UDP"}, "ProtocolUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedPortName: "main", expectedPort: 0, expectedProtocol: "UDP"},
} }
for name, tc := range tests { for name, tc := range tests {
suite.Suite.Run(name, func() { suite.Suite.Run(name, func() {
charts/library/common/tests/service_test.go
+12 -12
View File
@@ -52,10 +52,10 @@ func (suite *ServiceTestSuite) TestPortNames() {
expectedName string expectedName string
expectedTargetPort interface{} expectedTargetPort interface{}
}{ }{
"Default": {values: nil, expectedRenderFailure: false, expectedName: "http", expectedTargetPort: "http"}, "Default": {values: nil, expectedRenderFailure: false, expectedName: "main", expectedTargetPort: "main"},
"CustomName": {values: []string{"service.main.ports.http.enabled=false", "service.main.ports.server.enabled=true", "service.main.ports.server.port=8080"}, expectedRenderFailure: false, expectedName: "server", expectedTargetPort: "server"}, "CustomName": {values: []string{"service.main.ports.main.enabled=false", "service.main.ports.server.enabled=true", "service.main.ports.server.port=8080"}, expectedRenderFailure: false, expectedName: "server", expectedTargetPort: "server"},
"CustomTargetPort": {values: []string{"service.main.ports.http.targetPort=80"}, expectedRenderFailure: false, expectedName: "http", expectedTargetPort: 80}, "CustomTargetPort": {values: []string{"service.main.ports.main.targetPort=80"}, expectedRenderFailure: false, expectedName: "main", expectedTargetPort: 80},
"NamedTargetPort": {values: []string{"service.main.ports.http.targetPort=name"}, expectedRenderFailure: true, expectedName: "", expectedTargetPort: nil}, "NamedTargetPort": {values: []string{"service.main.ports.main.targetPort=name"}, expectedRenderFailure: true, expectedName: "", expectedTargetPort: nil},
} }
for name, tc := range tests { for name, tc := range tests {
suite.Suite.Run(name, func() { suite.Suite.Run(name, func() {
@@ -83,10 +83,10 @@ func (suite *ServiceTestSuite) TestPortProtocol() {
expectedProtocol string expectedProtocol string
}{ }{
"Default": {values: nil, expectedProtocol: "TCP"}, "Default": {values: nil, expectedProtocol: "TCP"},
"ExplicitTCP": {values: []string{"service.main.ports.http.protocol=TCP"}, expectedProtocol: "TCP"}, "ExplicitTCP": {values: []string{"service.main.ports.main.protocol=TCP"}, expectedProtocol: "TCP"},
"ExplicitHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedProtocol: "TCP"}, "ExplicitHTTP": {values: []string{"service.main.ports.main.protocol=HTTP"}, expectedProtocol: "TCP"},
"ExplicitHTTPS": {values: []string{"service.main.ports.http.protocol=HTTPS"}, expectedProtocol: "TCP"}, "ExplicitHTTPS": {values: []string{"service.main.ports.main.protocol=HTTPS"}, expectedProtocol: "TCP"},
"ExplicitUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedProtocol: "UDP"}, "ExplicitUDP": {values: []string{"service.main.ports.main.protocol=UDP"}, expectedProtocol: "UDP"},
} }
for name, tc := range tests { for name, tc := range tests {
suite.Suite.Run(name, func() { suite.Suite.Run(name, func() {
@@ -109,10 +109,10 @@ func (suite *ServiceTestSuite) TestAnnotations() {
expectedAnnotations map[string]string expectedAnnotations map[string]string
}{ }{
"Default": {values: nil, expectedAnnotations: nil}, "Default": {values: nil, expectedAnnotations: nil},
"ExplicitTCP": {values: []string{"service.main.ports.http.protocol=TCP"}, expectedAnnotations: nil}, "ExplicitTCP": {values: []string{"service.main.ports.main.protocol=TCP"}, expectedAnnotations: nil},
"ExplicitHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedAnnotations: nil}, "ExplicitHTTP": {values: []string{"service.main.ports.main.protocol=HTTP"}, expectedAnnotations: nil},
"ExplicitHTTPS": {values: []string{"service.main.ports.http.protocol=HTTPS"}, expectedAnnotations: map[string]string{"traefik.ingress.kubernetes.io/service.serversscheme": "https"}}, "ExplicitHTTPS": {values: []string{"service.main.ports.main.protocol=HTTPS"}, expectedAnnotations: map[string]string{"traefik.ingress.kubernetes.io/service.serversscheme": "https"}},
"ExplicitUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedAnnotations: nil}, "ExplicitUDP": {values: []string{"service.main.ports.main.protocol=UDP"}, expectedAnnotations: nil},
} }
for name, tc := range tests { for name, tc := range tests {
suite.Suite.Run(name, func() { suite.Suite.Run(name, func() {