Merge branch 'master' into limit-rbac-kanister-operator

kanisterio · Sep 26, 2024 · d8da34f · d8da34f
2 parents d9fff04 + 0847571
commit d8da34f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -39,3 +39,4 @@ Please join the Kanister community to give feedback on the roadmap
   resurrect https://github.com/kanisterio/kanister/issues/193
 1. Merge the Repository controller into the Kanister controller.
 1. Support for creation of blueprints/actionsets in application namespaces https://github.com/kanisterio/kanister/discussions/2922
+1. Support iterating over multiple resources with the same function https://github.com/kanisterio/kanister/discussions/3001
diff --git a/docker/postgres-kanister-tools/requirements.txt b/docker/postgres-kanister-tools/requirements.txt
@@ -1,4 +1,4 @@
-awscli==1.34.6
+awscli==1.34.26
 pip==24.2
-setuptools==73.0.1
+setuptools==75.1.0
 wheel==0.44.0
diff --git a/docker/postgresql/requirements.txt b/docker/postgresql/requirements.txt
@@ -1,5 +1,5 @@
-awscli==1.34.6
+awscli==1.34.26
 wal-e==1.1.1
 pip==24.2
-setuptools==73.0.1
+setuptools==75.1.0
 wheel==0.44.0
diff --git a/pkg/blockstorage/blockstorage_test.go b/pkg/blockstorage/blockstorage_test.go
@@ -142,7 +142,7 @@ func (s *BlockStorageProviderSuite) TestCreateSnapshot(c *check.C) {
 		c.Assert(err, check.IsNil)
 		s.snapshots = nil
 		_, err = s.provider.SnapshotGet(context.Background(), snapshot.ID)
-		c.Assert(err, check.IsNil)
+		c.Assert(err, check.NotNil)
 		c.Assert(strings.Contains(err.Error(), blockstorage.SnapshotDoesNotExistError), check.Equals, true)
 	}
 }