DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix golangci-lint errors (#10196)

Browse source 
* Fix golangci-lint errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix dupl errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix comments

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix errcheck lint errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix assert in e2e test

Signed-off-by: z1cheng <imchench@gmail.com>

* Not interrupt the waitForPodsReady

Signed-off-by: z1cheng <imchench@gmail.com>

* Replace string with constant

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix comments

Signed-off-by: z1cheng <imchench@gmail.com>

* Revert write file permision

Signed-off-by: z1cheng <imchench@gmail.com>

---------

Signed-off-by: z1cheng <imchench@gmail.com>
This commit is contained in:
Chen Chen 2023-08-31 15:36:48 +08:00 • committed by GitHub
parent 46d87d3462
commit b3060bfbd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
253 changed files with 2434 additions and 2113 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/k8s/main.go
View file

@ -33,7 +33,7 @@ import (
)
// ParseNameNS parses a string searching a namespace and name
func ParseNameNS(input string) (string, string, error) {
func ParseNameNS(input string) (ns, name string, err error) {
nsName := strings.Split(input, "/")
if len(nsName) != 2 {
return "", "", fmt.Errorf("invalid format (namespace/name) found in '%v'", input)
@ -148,7 +148,10 @@ const IngressNGINXController = "k8s.io/ingress-nginx"
// NetworkingIngressAvailable checks if the package "k8s.io/api/networking/v1"
// is available or not and if Ingress V1 is supported (k8s >= v1.19.0)
func NetworkingIngressAvailable(client clientset.Interface) bool {
version119, _ := version.ParseGeneric("v1.19.0")
version119, err := version.ParseGeneric("v1.19.0")
if err != nil {
return false
}
serverVersion, err := client.Discovery().ServerVersion()
if err != nil {

20
internal/k8s/main_test.go
View file

@ -17,7 +17,6 @@ limitations under the License.
package k8s
import (
"os"
"testing"
apiv1 "k8s.io/api/core/v1"
@ -203,7 +202,8 @@ func TestGetNodeIP(t *testing.T) {
},
},
}}}),
"demo", "10.0.0.2", true},
"demo", "10.0.0.2", true,
},
}
for _, fk := range fKNodes {
@ -216,32 +216,32 @@ func TestGetNodeIP(t *testing.T) {
func TestGetIngressPod(t *testing.T) {
// POD_NAME & POD_NAMESPACE not exist
os.Setenv("POD_NAME", "")
os.Setenv("POD_NAMESPACE", "")
t.Setenv("POD_NAME", "")
t.Setenv("POD_NAMESPACE", "")
err := GetIngressPod(testclient.NewSimpleClientset())
if err == nil {
t.Errorf("expected an error but returned nil")
}
// POD_NAME not exist
os.Setenv("POD_NAME", "")
os.Setenv("POD_NAMESPACE", apiv1.NamespaceDefault)
t.Setenv("POD_NAME", "")
t.Setenv("POD_NAMESPACE", apiv1.NamespaceDefault)
err = GetIngressPod(testclient.NewSimpleClientset())
if err == nil {
t.Errorf("expected an error but returned nil")
}
// POD_NAMESPACE not exist
os.Setenv("POD_NAME", "testpod")
os.Setenv("POD_NAMESPACE", "")
t.Setenv("POD_NAME", "testpod")
t.Setenv("POD_NAMESPACE", "")
err = GetIngressPod(testclient.NewSimpleClientset())
if err == nil {
t.Errorf("expected an error but returned nil")
}
// POD not exist
os.Setenv("POD_NAME", "testpod")
os.Setenv("POD_NAMESPACE", apiv1.NamespaceDefault)
t.Setenv("POD_NAME", "testpod")
t.Setenv("POD_NAMESPACE", apiv1.NamespaceDefault)
err = GetIngressPod(testclient.NewSimpleClientset())
if err == nil {
t.Errorf("expected an error but returned nil")