This commit includes topics following:

- update expected*.yaml
- update test.sh for getting kubectl v1.27 instead of v1.26
- update guestbook_controller

Author: stephanhorsthemke

examples/guestbook-operator/controllers/guestbook_controller.go

@@ -78,14 +78,13 @@ func (r *GuestbookReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	}
 
 	// Watch for changes to Guestbook
-	err = c.Watch(&source.Kind{Type: &api.Guestbook{}}, &handler.EnqueueRequestForObject{})
+	err = c.Watch(source.Kind(mgr.GetCache(), &api.Guestbook{}), &handler.EnqueueRequestForObject{})
 	if err != nil {
 		return err
 	}
 
 	// Watch for changes to deployed objects
-	_, err = declarative.WatchChildren(declarative.WatchChildrenOptions{Manager: mgr, Controller: c, Reconciler: r, LabelMaker: r.watchLabels})
-	if err != nil {
+	err = declarative.WatchChildren(declarative.WatchChildrenOptions{Manager: mgr, Controller: c, Reconciler: r, LabelMaker: r.watchLabels})	if err != nil {
 		return err
 	}
 

hack/ci/test.sh

@@ -31,7 +31,7 @@ REPO_ROOT=$(pwd)
 if [[ ! -f "bin/kubectl" ]]; then
   echo "Downloading kubectl to bin/kubectl"
   mkdir -p bin/
-  curl -L -o bin/kubectl https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl
+  curl -L -o bin/kubectl https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl
 fi
 chmod +x bin/kubectl
 export PATH="${REPO_ROOT}/bin:$PATH"

pkg/patterns/declarative/pkg/applier/testdata/applylib/simple1/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK

pkg/patterns/declarative/pkg/applier/testdata/applylib/simple2/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK

pkg/patterns/declarative/pkg/applier/testdata/applylib/simple3/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK

pkg/patterns/declarative/pkg/applier/testdata/direct/simple1/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK

pkg/patterns/declarative/pkg/applier/testdata/direct/simple2/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK

pkg/patterns/declarative/pkg/applier/testdata/direct/simple3/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected-apiserver.yaml

@@ -27,7 +27,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
+GET /api/v1
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected.yaml

@@ -1,4 +1,4 @@
-GET http://kube-apiserver/api/v1?timeout=32s
+GET http://kube-apiserver/api/v1
 Accept: application/json, */*
 
 200 OK