Remove unnecessary return value

rancher · Jan 17, 2024 · 29f2589 · 29f2589
1 parent 839c1fc
commit 29f2589
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/scripts/run-integration-tests.sh b/.github/scripts/run-integration-tests.sh
@@ -2,8 +2,8 @@
 
 set -euxo pipefail
 
-SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20221214170741-69f093833822}
-ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.25}
+SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20240115093953-9e6e3b144a69}
+ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.28}
 
 # install and prepare setup-envtest
 if ! command -v setup-envtest &> /dev/null
@@ -14,4 +14,4 @@ KUBEBUILDER_ASSETS=$(setup-envtest use --use-env -p path $ENVTEST_K8S_VERSION)
 export KUBEBUILDER_ASSETS
 
 # run integration tests
-go test ./integrationtests/...
+go test ./integrationtests/agent/...
diff --git a/internal/cmd/agent/trigger/watcher.go b/internal/cmd/agent/trigger/watcher.go
@@ -132,11 +132,10 @@ func (t *Trigger) OnChange(key string, defaultNamespace string, trigger func(),
 	return nil
 }
 
-func (t *Trigger) storeObjectGeneration(uid types.UID, generation int64) *atomic.Int64 {
+func (t *Trigger) storeObjectGeneration(uid types.UID, generation int64) {
 	value := new(atomic.Int64)
 	value.Store(generation)
 	t.seenGenerations.Store(uid, value)
-	return value
 }
 
 func (t *Trigger) call(gvk schema.GroupVersionKind, obj metav1.Object, deleted bool) {