Merge branch 'master' into add-support-for-cache-size-limit-flags-for…

…-kopia-server-with-server-changes

.github/dependabot.yml

@@ -51,151 +51,50 @@ updates:
       docker:
         patterns:
         - "docker/*"
-  ## Currently dependabot does not support wildcard or multiple directories
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  # Update pinned pip packages via requiements.txt
-  - package-ecosystem: "pip"
-    directory: "/docker/build"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker,pip):"
-  - package-ecosystem: "docker"
-    directory: "/docker/build"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/cassandra"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/controller"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/couchbase-tools"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/docs-build"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/foundationdb"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/kafka-adobes3Connector/image"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/kanister-elasticsearch/image"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/kanister-kubectl"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/kanister-mongodb-replicaset"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/kanister-mysql"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/license_extractor"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/mongodb"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/mongodb-atlas"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/mssql-tools"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
+
   # Update pinned pip packages via requiements.txt
   - package-ecosystem: "pip"
-    directory: "/docker/postgres-kanister-tools"
-    schedule:
-      interval: weekly
+    schedule: weekly
     commit-message:
       prefix: "deps(docker,pip):"
+    directories:
+      - "/docker/build"
+      - "/docker/postgres-kanister-tools"
+      - "/docker/postgresql"
+
   - package-ecosystem: "docker"
-    directory: "/docker/postgres-kanister-tools"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  # Update pinned pip packages via requiements.txt
-  - package-ecosystem: "pip"
-    directory: "/docker/postgresql"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker,pip):"
-  - package-ecosystem: "docker"
-    directory: "/docker/postgresql"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/redis-tools"
-    schedule:
-      interval: weekly
-    commit-message:
-      prefix: "deps(docker):"
-  - package-ecosystem: "docker"
-    directory: "/docker/repo-server-controller"
     schedule:
       interval: weekly
     commit-message:
       prefix: "deps(docker):"
+    directories:
+      - "/"
+      - "/docker/build"
+      - "/docker/tools"
+      - "/docker/controller"
+      - "/docker/kanister-kubectl"
+      - "/docker/repo-server-controller"
+      - "/docker/postgres-kanister-tools"
+
   - package-ecosystem: "docker"
-    directory: "/docker/tools"
     schedule:
       interval: weekly
     commit-message:
       prefix: "deps(docker):"
+    directories:
+      - "/docker/cassandra"
+      - "/docker/couchbase-tools"
+      - "/docker/docs-build"
+      - "/docker/foundationdb"
+      - "/docker/kafka-adobes3Connector/image"
+      - "/docker/kanister-elasticsearch/image"
+      - "/docker/kanister-mongodb-replicaset"
+      - "/docker/kanister-mysql"
+      - "/docker/license_extractor"
+      - "/docker/mongodb"
+      - "/docker/mongodb-atlas"
+      - "/docker/mssql-tools"
+      - "/docker/postgresql"
+      - "/docker/redis-tools"
+
+

.golangci.yml

@@ -45,7 +45,6 @@ issues:
         - dupl
         - nestif
         - gci
-        - stylecheck
 
     - text: "`ctx` is unused"           # Context might not be in use in places, but for consistency, we pass it.
       linters:

Dockerfile.in

@@ -1,4 +1,4 @@
-ARG base_image=registry.access.redhat.com/ubi9/ubi-minimal:9.4-1194
+ARG base_image=registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227
 FROM ${base_image}
 ARG kanister_version
 

docker/controller/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227
 
 LABEL maintainer="Tom Manville<[email protected]>"
 

docker/mongodb-atlas/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227
 
 RUN cat >/etc/yum.repos.d/mongodb.repo <<EOL
 [mongodb-org-6.0]

docker/tools/Dockerfile

@@ -74,7 +74,7 @@ RUN apt-get update && apt-get -y install ca-certificates && \
 USER kopia:kopia
 
 # Build tools image
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227
 ARG kan_tools_version="test-version"
 LABEL name="kanister-tools" \
     vendor="Kanister" \

pkg/controllers/repositoryserver/repositoryserver_controller_test.go

@@ -47,7 +47,6 @@ import (
 	"github.com/kanisterio/kanister/pkg/resource"
 	"github.com/kanisterio/kanister/pkg/secrets"
 	"github.com/kanisterio/kanister/pkg/secrets/repositoryserver"
-	reposerver "github.com/kanisterio/kanister/pkg/secrets/repositoryserver"
 	"github.com/kanisterio/kanister/pkg/testutil"
 )
 
@@ -190,23 +189,23 @@ func (s *RepoServerControllerSuite) createRepositoryServerSecrets(c *C) {
 }
 
 func (s *RepoServerControllerSuite) CreateRepositoryServerAdminSecret(data map[string][]byte) (se *corev1.Secret, err error) {
-	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-server-admin-", reposerver.AdminCredentialsSecret, data)
+	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-server-admin-", repositoryserver.AdminCredentialsSecret, data)
 }
 
 func (s *RepoServerControllerSuite) CreateRepositoryServerUserAccessSecret(data map[string][]byte) (se *corev1.Secret, err error) {
 	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-server-user-access-", "", data)
 }
 
 func (s *RepoServerControllerSuite) CreateRepositoryPasswordSecret(data map[string][]byte) (se *corev1.Secret, err error) {
-	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-password-", reposerver.RepositoryPasswordSecret, data)
+	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-password-", repositoryserver.RepositoryPasswordSecret, data)
 }
 
 func (s *RepoServerControllerSuite) CreateKopiaTLSSecret(data map[string][]byte) (se *corev1.Secret, err error) {
 	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-kopia-tls-", corev1.SecretTypeTLS, data)
 }
 
 func (s *RepoServerControllerSuite) CreateStorageLocationSecret(data map[string][]byte) (se *corev1.Secret, err error) {
-	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-server-storage-", reposerver.Location, data)
+	return testutil.CreateSecret(s.kubeCli, s.repoServerControllerNamespace, "test-repository-server-storage-", repositoryserver.Location, data)
 }
 
 func (s *RepoServerControllerSuite) CreateAWSStorageCredentialsSecret(data map[string][]byte) (se *corev1.Secret, err error) {

pkg/kopia/command/storage/secret_utils_test.go

@@ -79,7 +79,7 @@ func (s *StorageUtilsSuite) TestLocationUtils(c *check.C) {
 }
 
 func (s *StorageUtilsSuite) TestGenerateEnvSpecFromCredentialSecret(c *check.C) {
-	awsAccessKeyId := "access-key-id"
+	awsAccessKeyID := "access-key-id"
 	awsSecretAccessKey := "secret-access-key"
 
 	azureStorageAccountID := "azure-storage-account-id"
@@ -99,7 +99,7 @@ func (s *StorageUtilsSuite) TestGenerateEnvSpecFromCredentialSecret(c *check.C)
 				},
 				Type: corev1.SecretType(secrets.AWSSecretType),
 				Data: map[string][]byte{
-					secrets.AWSAccessKeyID:     []byte(awsAccessKeyId),
+					secrets.AWSAccessKeyID:     []byte(awsAccessKeyID),
 					secrets.AWSSecretAccessKey: []byte(awsSecretAccessKey),
 				},
 			},

pkg/kube/fips_test.go

@@ -98,16 +98,16 @@ func (s *FIPSSuite) TestFIPSBoringEnabled(c *C) {
 			c.Assert(err, IsNil)
 			c.Assert(stderr, Equals, "")
 			scanner := bufio.NewScanner(strings.NewReader(stdout))
-			fips_mode_set := false
+			fipsModeSet := false
 			for scanner.Scan() {
 				if strings.Contains(scanner.Text(), "FIPS") {
 					c.Log(scanner.Text())
 				}
 				if strings.Contains(scanner.Text(), "FIPS_mode_set") {
-					fips_mode_set = true
+					fipsModeSet = true
 				}
 			}
-			c.Assert(fips_mode_set, Equals, true)
+			c.Assert(fipsModeSet, Equals, true)
 		}
 	}
 }

pkg/secrets/secrets_test.go

@@ -24,7 +24,6 @@ import (
 
 	secerrors "github.com/kanisterio/kanister/pkg/secrets/errors"
 	"github.com/kanisterio/kanister/pkg/secrets/repositoryserver"
-	reposerver "github.com/kanisterio/kanister/pkg/secrets/repositoryserver"
 )
 
 func Test(t *testing.T) { TestingT(t) }
@@ -44,7 +43,7 @@ func (s *SecretUtilsSuite) TestGetLocationSecret(c *C) {
 			secret: &corev1.Secret{
 				Type: corev1.SecretType(repositoryserver.Location),
 				Data: map[string][]byte{
-					reposerver.TypeKey: []byte(reposerver.LocTypeGCS),
+					repositoryserver.TypeKey: []byte(repositoryserver.LocTypeGCS),
 				},
 			},
 			errChecker:            IsNil,
@@ -55,7 +54,7 @@ func (s *SecretUtilsSuite) TestGetLocationSecret(c *C) {
 			secret: &corev1.Secret{
 				Type: corev1.SecretType(repositoryserver.Location),
 				Data: map[string][]byte{
-					reposerver.TypeKey: []byte(reposerver.LocTypeAzure),
+					repositoryserver.TypeKey: []byte(repositoryserver.LocTypeAzure),
 				},
 			},
 			errChecker:            IsNil,
@@ -66,7 +65,7 @@ func (s *SecretUtilsSuite) TestGetLocationSecret(c *C) {
 			secret: &corev1.Secret{
 				Type: corev1.SecretType(repositoryserver.Location),
 				Data: map[string][]byte{
-					reposerver.TypeKey: []byte(reposerver.LocTypeS3),
+					repositoryserver.TypeKey: []byte(repositoryserver.LocTypeS3),
 				},
 			},
 			errChecker:            IsNil,
@@ -77,7 +76,7 @@ func (s *SecretUtilsSuite) TestGetLocationSecret(c *C) {
 			secret: &corev1.Secret{
 				Type: corev1.SecretType(repositoryserver.Location),
 				Data: map[string][]byte{
-					reposerver.TypeKey: []byte(reposerver.LocTypeFilestore),
+					repositoryserver.TypeKey: []byte(repositoryserver.LocTypeFilestore),
 				},
 			},
 			errChecker:            IsNil,
@@ -94,7 +93,7 @@ func (s *SecretUtilsSuite) TestGetLocationSecret(c *C) {
 			},
 			errChecker:            NotNil,
 			locationSecretChecker: IsNil,
-			expectedError:         errors.Wrapf(secerrors.ErrValidate, secerrors.MissingRequiredFieldErrorMsg, reposerver.TypeKey, "ns", "sec"),
+			expectedError:         errors.Wrapf(secerrors.ErrValidate, secerrors.MissingRequiredFieldErrorMsg, repositoryserver.TypeKey, "ns", "sec"),
 		},
 		{ // Unsupported location type
 			secret: &corev1.Secret{
@@ -104,7 +103,7 @@ func (s *SecretUtilsSuite) TestGetLocationSecret(c *C) {
 					Namespace: "ns",
 				},
 				Data: map[string][]byte{
-					reposerver.TypeKey: []byte("invalid"),
+					repositoryserver.TypeKey: []byte("invalid"),
 				},
 			},
 			errChecker:            NotNil,