From 645673f04a40704fb9e138829196964418af8198 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sat, 22 May 2021 23:12:26 +0200 Subject: [PATCH] fix main port rename for common unit-tests --- charts/library/common/Chart.yaml | 2 +- charts/library/common/tests/container_test.go | 8 +++---- charts/library/common/tests/service_test.go | 24 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index d0c49ace09b..5ff32ab5fa7 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -19,4 +19,4 @@ name: common sources: - https://github.com/truecharts/apps/tree/master/library/common type: library -version: 4.1.2 +version: 4.1.3 diff --git a/charts/library/common/tests/container_test.go b/charts/library/common/tests/container_test.go index 1342a8e03bd..7e3373c6c3c 100644 --- a/charts/library/common/tests/container_test.go +++ b/charts/library/common/tests/container_test.go @@ -203,11 +203,11 @@ func (suite *ContainerTestSuite) TestPorts() { expectedPort int 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"}, - "ProtocolHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedPortName: "http", expectedPort: 0, expectedProtocol: "TCP"}, - "ProtocolHTTPS": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedPortName: "http", expectedPort: 0, expectedProtocol: "TCP"}, - "ProtocolUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedPortName: "http", expectedPort: 0, expectedProtocol: "UDP"}, + "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: "main", expectedPort: 0, expectedProtocol: "TCP"}, + "ProtocolUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedPortName: "main", expectedPort: 0, expectedProtocol: "UDP"}, } for name, tc := range tests { suite.Suite.Run(name, func() { diff --git a/charts/library/common/tests/service_test.go b/charts/library/common/tests/service_test.go index 13a31a96c64..c4b6e311a68 100644 --- a/charts/library/common/tests/service_test.go +++ b/charts/library/common/tests/service_test.go @@ -52,10 +52,10 @@ func (suite *ServiceTestSuite) TestPortNames() { expectedName string expectedTargetPort interface{} }{ - "Default": {values: nil, expectedRenderFailure: false, expectedName: "http", expectedTargetPort: "http"}, - "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"}, - "CustomTargetPort": {values: []string{"service.main.ports.http.targetPort=80"}, expectedRenderFailure: false, expectedName: "http", expectedTargetPort: 80}, - "NamedTargetPort": {values: []string{"service.main.ports.http.targetPort=name"}, expectedRenderFailure: true, expectedName: "", expectedTargetPort: nil}, + "Default": {values: nil, expectedRenderFailure: false, expectedName: "main", expectedTargetPort: "main"}, + "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.main.targetPort=80"}, expectedRenderFailure: false, expectedName: "main", expectedTargetPort: 80}, + "NamedTargetPort": {values: []string{"service.main.ports.main.targetPort=name"}, expectedRenderFailure: true, expectedName: "", expectedTargetPort: nil}, } for name, tc := range tests { suite.Suite.Run(name, func() { @@ -83,10 +83,10 @@ func (suite *ServiceTestSuite) TestPortProtocol() { expectedProtocol string }{ "Default": {values: nil, expectedProtocol: "TCP"}, - "ExplicitTCP": {values: []string{"service.main.ports.http.protocol=TCP"}, expectedProtocol: "TCP"}, - "ExplicitHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedProtocol: "TCP"}, - "ExplicitHTTPS": {values: []string{"service.main.ports.http.protocol=HTTPS"}, expectedProtocol: "TCP"}, - "ExplicitUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedProtocol: "UDP"}, + "ExplicitTCP": {values: []string{"service.main.ports.main.protocol=TCP"}, expectedProtocol: "TCP"}, + "ExplicitHTTP": {values: []string{"service.main.ports.main.protocol=HTTP"}, expectedProtocol: "TCP"}, + "ExplicitHTTPS": {values: []string{"service.main.ports.main.protocol=HTTPS"}, expectedProtocol: "TCP"}, + "ExplicitUDP": {values: []string{"service.main.ports.main.protocol=UDP"}, expectedProtocol: "UDP"}, } for name, tc := range tests { suite.Suite.Run(name, func() { @@ -109,10 +109,10 @@ func (suite *ServiceTestSuite) TestAnnotations() { expectedAnnotations map[string]string }{ "Default": {values: nil, expectedAnnotations: nil}, - "ExplicitTCP": {values: []string{"service.main.ports.http.protocol=TCP"}, expectedAnnotations: nil}, - "ExplicitHTTP": {values: []string{"service.main.ports.http.protocol=HTTP"}, expectedAnnotations: nil}, - "ExplicitHTTPS": {values: []string{"service.main.ports.http.protocol=HTTPS"}, expectedAnnotations: map[string]string{"traefik.ingress.kubernetes.io/service.serversscheme": "https"}}, - "ExplicitUDP": {values: []string{"service.main.ports.http.protocol=UDP"}, expectedAnnotations: nil}, + "ExplicitTCP": {values: []string{"service.main.ports.main.protocol=TCP"}, expectedAnnotations: nil}, + "ExplicitHTTP": {values: []string{"service.main.ports.main.protocol=HTTP"}, expectedAnnotations: nil}, + "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.main.protocol=UDP"}, expectedAnnotations: nil}, } for name, tc := range tests { suite.Suite.Run(name, func() {