Skip to content

Commit 56eb52f

Browse files
nirrozenbaumrlakhtakia
authored andcommitted
few updates in datastore (kubernetes-sigs#713)
* few updates in datastore Signed-off-by: Nir Rozenbaum <nirro@il.ibm.com> * PoolSet documentation Signed-off-by: Nir Rozenbaum <nirro@il.ibm.com> * error phrasing Signed-off-by: Nir Rozenbaum <nirro@il.ibm.com> * removed unused pool arg from PodUpdateOrAddIfNotExist Signed-off-by: Nir Rozenbaum <nirro@il.ibm.com> * linter Signed-off-by: Nir Rozenbaum <nirro@il.ibm.com> --------- Signed-off-by: Nir Rozenbaum <nirro@il.ibm.com>
1 parent e03802a commit 56eb52f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

pkg/epp/controller/pod_reconciler.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ 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
3132
"sigs.k8s.io/controller-runtime/pkg/predicate"
33+
=======
34+
>>>>>>> 7792676 (few updates in datastore (#713))
3235
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3336
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3437
podutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/pod"

0 commit comments

Comments
 (0)