Skip to content

Commit

Permalink
Update yaml files and few items for CI test
Browse files Browse the repository at this point in the history
This commit includes topics following:
- update expected*.yaml
- update test.sh for getting kubectl v1.27 instead of v1.26
- update guestbook_controller
  • Loading branch information
atoato88 committed May 12, 2023
1 parent 6ddcfe7 commit 464aec1
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +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})
err = declarative.WatchChildren(declarative.WatchChildrenOptions{Manager: mgr, Controller: c, Reconciler: r, LabelMaker: r.watchLabels})
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET /api/v1?timeout=32s
GET /api/v1
Accept: application/json, */*
Accept-Encoding: gzip

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET /api/v1?timeout=32s
GET /api/v1
Accept: application/json, */*
Accept-Encoding: gzip

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET /api/v1?timeout=32s
GET /api/v1
Accept: application/json, */*
Accept-Encoding: gzip

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/apis/addons.example.org/v1alpha1?timeout=32s
GET http://kube-apiserver/apis/addons.example.org/v1alpha1
Accept: application/json, */*

200 OK
Expand Down Expand Up @@ -36,7 +36,7 @@ Date: (removed)

---

GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand All @@ -49,7 +49,7 @@ Date: (removed)

---

GET http://kube-apiserver/apis/apps/v1?timeout=32s
GET http://kube-apiserver/apis/apps/v1
Accept: application/json, */*

200 OK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GET http://kube-apiserver/apis/addons.example.org/v1alpha1?timeout=32s
GET http://kube-apiserver/apis/addons.example.org/v1alpha1
Accept: application/json, */*

200 OK
Expand Down Expand Up @@ -36,7 +36,7 @@ Date: (removed)

---

GET http://kube-apiserver/api/v1?timeout=32s
GET http://kube-apiserver/api/v1
Accept: application/json, */*

200 OK
Expand All @@ -49,7 +49,7 @@ Date: (removed)

---

GET http://kube-apiserver/apis/apps/v1?timeout=32s
GET http://kube-apiserver/apis/apps/v1
Accept: application/json, */*

200 OK
Expand Down Expand Up @@ -231,7 +231,7 @@ Date: (removed)

---

GET http://kube-apiserver/api?timeout=32s
GET http://kube-apiserver/api
Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json

200 OK
Expand All @@ -244,7 +244,7 @@ Date: (removed)

---

GET http://kube-apiserver/apis?timeout=32s
GET http://kube-apiserver/apis
Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json

200 OK
Expand Down

0 comments on commit 464aec1

Please sign in to comment.