Skip to content

Commit 56d20e5

Browse files
nirrozenbaumrlakhtakia
authored andcommitted
few updates in datastore (#713)
* few updates in datastore Signed-off-by: Nir Rozenbaum <[email protected]> * PoolSet documentation Signed-off-by: Nir Rozenbaum <[email protected]> * error phrasing Signed-off-by: Nir Rozenbaum <[email protected]> * removed unused pool arg from PodUpdateOrAddIfNotExist Signed-off-by: Nir Rozenbaum <[email protected]> * linter Signed-off-by: Nir Rozenbaum <[email protected]> --------- Signed-off-by: Nir Rozenbaum <[email protected]>
1 parent 56eb52f commit 56d20e5

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

pkg/epp/controller/pod_reconciler.go

-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/event"
3030
"sigs.k8s.io/controller-runtime/pkg/log"
31-
<<<<<<< HEAD
3231
"sigs.k8s.io/controller-runtime/pkg/predicate"
33-
=======
34-
>>>>>>> 7792676 (few updates in datastore (#713))
3532
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3633
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3734
podutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/pod"

0 commit comments

Comments
 (0)