Update dependencies and other maintenance (#382)

- Bump versions exercised in Helm upgrade test.
- Update dependencies and consolidate some dependencies. For example, we
  had two YAML parsers with similar APIs that were being imported.
- Remove usage of deprecated ioutil functions.
- Reorganize imports according to Golang conventions, and use consistent
  import aliases for packages.
- Remove code related to obsolete Tiller operator.

go.mod

@@ -5,14 +5,13 @@ go 1.21
 toolchain go1.21.6
 
 require (
-	github.com/Masterminds/semver v1.5.0
+	github.com/Masterminds/semver/v3 v3.3.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/google/go-cmp v0.6.0
 	github.com/gruntwork-io/terratest v0.46.8
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/otiai10/copy v1.14.0
 	github.com/stretchr/testify v1.8.4
-	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.29.0
 	k8s.io/apimachinery v0.29.0
 )
@@ -68,6 +67,7 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/client-go v0.29.0 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8 // indirect

go.sum

@@ -1,5 +1,5 @@
-github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
+github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aws/aws-sdk-go v1.49.12 h1:SbGHDdMjtuTL8zpRXKjvIvQHLt9cCqcxcHoJps23WxI=

incubator/cloudbeaver/Chart.yaml

@@ -14,5 +14,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: 22.1.4
-tillerVersion: ">=2.9"
-

incubator/demo-ycsb/Chart.yaml

@@ -13,4 +13,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: "6.0"
-tillerVersion: ">=2.9"

scripts/ci/install_deps.sh

@@ -100,12 +100,7 @@ elif [[ "$REQUIRES_MINISHIFT" == "true" ]]; then
   oc status
 
   kubectl cluster-info
-
-  kubectl -n kube-system create serviceaccount tiller-system
-  kubectl create clusterrolebinding tiller-system --clusterrole cluster-admin --serviceaccount=kube-system:tiller-system
-
   helm version
-
   kubectl version
 
   # disable THP to match minikube

stable/admin/Chart.yaml

@@ -13,4 +13,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: "6.0"
-tillerVersion: ">=2.9"

stable/database/Chart.yaml

@@ -13,4 +13,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: "6.0"
-tillerVersion: ">=2.9"

stable/restore/Chart.yaml

@@ -14,4 +14,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: "6.0"
-tillerVersion: ">=2.9"

stable/storage-class/Chart.yaml

@@ -13,4 +13,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: "6.0"
-tillerVersion: ">=2.9"

stable/transparent-hugepage/Chart.yaml

@@ -14,4 +14,3 @@ maintainers:
 engine: gotpl
 icon: https://raw.githubusercontent.com/nuodb/nuodb-helm-charts/master/images/nuodb.svg
 appVersion: "6.0"
-tillerVersion: ">=2.9"

test/integration/database_marshall_test.go

@@ -1,15 +1,15 @@
 package integration
 
 import (
-	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 
-	"testing"
+	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 )
 
 func TestDatabaseUnmarshal(t *testing.T) {
-	s := (
-		`{
+	s := (`{
   "incarnation": {
     "major": 1, 
     "minor": 2

test/integration/kube_config_marshall_test.go

@@ -1,16 +1,16 @@
 package integration
 
 import (
-	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
+	"os"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 
-	"io/ioutil"
-	"testing"
+	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 )
 
-
 func TestKubeConfigUnmarshall(t *testing.T) {
-	content, err := ioutil.ReadFile("../files/nuodb-dump.json")
+	content, err := os.ReadFile("../files/nuodb-dump.json")
 	assert.NoError(t, err)
 
 	err, objects := testlib.UnmarshalNuoDBKubeConfig(string(content))
@@ -26,27 +26,36 @@ func TestKubeConfigUnmarshall(t *testing.T) {
 	assert.True(t, len(config.Volumes) == 3)
 
 	// StatefulSets
-	assert.True(t, func() bool {_, ok := config.StatefulSets["admin-u7mxhy-nuodb-cluster0"]; return ok}())
-	assert.True(t, func() bool {_, ok := config.StatefulSets["sm-database-vslldk-nuodb-cluster0-demo"]; return ok}())
-	assert.True(t, func() bool {_, ok := config.StatefulSets["sm-database-vslldk-nuodb-cluster0-demo-hotcopy"]; return ok}())
+	assert.True(t, func() bool { _, ok := config.StatefulSets["admin-u7mxhy-nuodb-cluster0"]; return ok }())
+	assert.True(t, func() bool { _, ok := config.StatefulSets["sm-database-vslldk-nuodb-cluster0-demo"]; return ok }())
+	assert.True(t, func() bool { _, ok := config.StatefulSets["sm-database-vslldk-nuodb-cluster0-demo-hotcopy"]; return ok }())
 
 	// Deployments
-	assert.True(t, func() bool {_, ok := config.Deployments["te-database-vslldk-nuodb-cluster0-demo"]; return ok}())
+	assert.True(t, func() bool { _, ok := config.Deployments["te-database-vslldk-nuodb-cluster0-demo"]; return ok }())
 
 	// Admin Volumes
-	assert.True(t, func() bool {_, ok := config.Volumes["raftlog-admin-u7mxhy-nuodb-cluster0-0"]; return ok}())
+	assert.True(t, func() bool { _, ok := config.Volumes["raftlog-admin-u7mxhy-nuodb-cluster0-0"]; return ok }())
 
 	// DB Volumes
-	assert.True(t, func() bool {_, ok := config.Volumes["archive-volume-sm-database-vslldk-nuodb-cluster0-demo-hotcopy-0"]; return ok}())
-	assert.True(t, func() bool {_, ok := config.Volumes["backup-volume-sm-database-vslldk-nuodb-cluster0-demo-hotcopy-0"]; return ok}())
+	assert.True(t, func() bool {
+		_, ok := config.Volumes["archive-volume-sm-database-vslldk-nuodb-cluster0-demo-hotcopy-0"]
+		return ok
+	}())
+	assert.True(t, func() bool {
+		_, ok := config.Volumes["backup-volume-sm-database-vslldk-nuodb-cluster0-demo-hotcopy-0"]
+		return ok
+	}())
 
 	// Admin Pods
-	assert.True(t, func() bool {_, ok := config.Pods["admin-u7mxhy-nuodb-cluster0-0"]; return ok}())
-	assert.True(t, func() bool {_, ok := config.Pods["job-lb-policy-nearest-zs9jl"]; return ok}())
+	assert.True(t, func() bool { _, ok := config.Pods["admin-u7mxhy-nuodb-cluster0-0"]; return ok }())
+	assert.True(t, func() bool { _, ok := config.Pods["job-lb-policy-nearest-zs9jl"]; return ok }())
 
 	// DB Pods
-	assert.True(t, func() bool {_, ok := config.Pods["sm-database-vslldk-nuodb-cluster0-demo-hotcopy-0"]; return ok}())
-	assert.True(t, func() bool {_, ok := config.Pods["hotcopy-demo-job-initial-549rc"]; return ok}())
-	assert.True(t, func() bool {_, ok := config.Pods["te-database-vslldk-nuodb-cluster0-demo-65c4cdf487-wbzj9"]; return ok}())
+	assert.True(t, func() bool { _, ok := config.Pods["sm-database-vslldk-nuodb-cluster0-demo-hotcopy-0"]; return ok }())
+	assert.True(t, func() bool { _, ok := config.Pods["hotcopy-demo-job-initial-549rc"]; return ok }())
+	assert.True(t, func() bool {
+		_, ok := config.Pods["te-database-vslldk-nuodb-cluster0-demo-65c4cdf487-wbzj9"]
+		return ok
+	}())
 
 }

test/integration/process_marshall_test.go

@@ -2,11 +2,11 @@ package integration
 
 import (
 	"encoding/json"
+	"testing"
 
-	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 	"github.com/stretchr/testify/assert"
 
-	"testing"
+	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 )
 
 func TestUnmarshall(t *testing.T) {

test/integration/registry_entry_marshall_test.go

@@ -1,23 +1,22 @@
 package integration
 
 import (
-	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 
-	"testing"
+	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 )
 
 func TestRegistryEntryUnmarshal(t *testing.T) {
-	s := (
-`nuodb:
+	s := (`nuodb:
   image:
     registry: local
     repository: master
     tag: latest
 `)
 
-	err, object := testlib.UnmarshalImageYAML(s)
-
+	object, err := testlib.UnmarshalImageYAML(s)
 	assert.NoError(t, err)
 
 	assert.True(t, object.Nuodb.Image.Registry == "local")

test/integration/shell_scripts_lint_test.go

@@ -8,9 +8,10 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/nuodb/nuodb-helm-charts/v3/test/testlib"
 )
 
 const shebangPattern = "[#][!][ \t]*.+[/ ](sh|bash)"