-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: e2e watcher integration #236
Conversation
…yma-project#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
52084f2
to
856bec2
Compare
/hold |
856bec2
to
2cc439e
Compare
2cc439e
to
c1cd027
Compare
As a side comment: CRDs and CRs cannot be a part of the same Kustomize deploy. Eventually it works but a better strategy is required. kubernetes-sigs/kustomize#3502
|
03644c0
to
9af547c
Compare
@@ -23,7 +23,7 @@ components: | |||
- ../crd | |||
- ../rbac | |||
# [WATCHER] To enable the watcher, uncomment all the sections with [WATCHER] | |||
#- ../watcher | |||
- ../watcher |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
watcher should be disabled by default
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes I am aware this for the reviewer to check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
anyways the Kustomize build has to be fixed
@@ -23,7 +23,7 @@ components: | |||
- ../crd | |||
- ../rbac | |||
# [WATCHER] To enable the watcher, uncomment all the sections with [WATCHER] | |||
#- ../watcher | |||
- ../watcher |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- ../watcher | |
#- ../watcher |
value: --requeue-failure-interval=5m | ||
- op: add | ||
path: /spec/template/spec/containers/0/args/- | ||
value: --kcp-addr=34.76.239.193:80 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we have an issue cover this address problem? to reach it from fixed DNS name instead of IP?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not yet good point. That is a whole another feature implementation. Should not be a part of this PR.
@@ -58,14 +58,14 @@ var _ = Describe("deploy watcher", Ordered, func() { | |||
}) | |||
|
|||
It("deploys watcher helm chart with correct webhook config", func() { | |||
err := deploy.UpdateWebhookConfig(ctx, webhookChartPath, watcherCR, testEnv.Config, k8sClient) | |||
err := deploy.UpdateWebhookConfig(ctx, webhookChartPath, watcherCR, testEnv.Config, k8sClient, "") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should have an explainable variable to the last param, like "fake-ip"
instead of empty string.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will either be a DNS Name or an IP. If DNS Name is not passed, then IP will be calculated from istio ingress service. See upcoming commit.
* refactor and improve docs * connect docs and further refinement * review comments
…le-manager into fixE2EWatcher
aee0717
to
5aed616
Compare
/unhold |
* add KCP watcher controller and tests (#224) * add KCP watcher controller and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> * Dynamically create Virtual Service resource for watcher reconciler (#231) * add KCP watcher controller and tests * refactor and fix tests * further refactoring and fixes * fix Dockerfile and update dependencies * remove skipped tests * refactor tests * add watcher crd and fix module info state * fix tests and lint issues * - update Dockerfile * - add missing watcher.yaml * - update watcher yaml * - update gomod * add args enable-kcp-watcher patch * create virtual service resource if it doesn't exist * clean up virtual service vars and params * apply review suggestions * change contract version from 1 to v1 Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Xin Ruan <xin.ruan@sap.com> * fix: e2e watcher integration (#236) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: remove virtual service (#239) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP * remote virtual service * fix: secret gen for kyma (#240) Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Dynamic Informers watches manifest instead of all resources (#244) * - add patch for gateway namespace - remove VirtualService - watches manifest instead of all resources under operator group * let dynamic informers to only watch manifest * remove patch comment * remove redundant array init * Fix watcher bugs for load test (#246) * ignore go.work files * fix virtual service deletion bug * rm unused method * fix watcher false ready state * make helm value overwrite working * fix loadbalancer creation and update * fix gateway error * fix: failing logic and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> * fix: merge conflicts for add_watcher (#252) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * fix: secret gen for kyma (#240) * Advance the Documentation of local setup (#248) * Fixed some links in readme doc * Added missing doc stuff Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com> * fix: merge conflicts for load_test (#253) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * fix: secret gen for kyma (#240) * Advance the Documentation of local setup (#248) * Fixed some links in readme doc * Added missing doc stuff * docs: add contents and other minor fixes (#250) * fix: failing watcher tests and minor refactoring * comment out watcher Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com> * Adjust watcher for load test (#254) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * fix: secret gen for kyma (#240) * Advance the Documentation of local setup (#248) * Fixed some links in readme doc * Added missing doc stuff * docs: add contents and other minor fixes (#250) * patch for load test * adjust reconciler interval add istio sidecar Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com> Co-authored-by: Ali Khlifi <46890720+khlifi411@users.noreply.github.com> Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com>
* add KCP watcher controller and tests (#224) * add KCP watcher controller and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> * Dynamically create Virtual Service resource for watcher reconciler (#231) * add KCP watcher controller and tests * refactor and fix tests * further refactoring and fixes * fix Dockerfile and update dependencies * remove skipped tests * refactor tests * add watcher crd and fix module info state * fix tests and lint issues * - update Dockerfile * - add missing watcher.yaml * - update watcher yaml * - update gomod * add args enable-kcp-watcher patch * create virtual service resource if it doesn't exist * clean up virtual service vars and params * apply review suggestions * change contract version from 1 to v1 Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Xin Ruan <xin.ruan@sap.com> * fix: e2e watcher integration (#236) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: remove virtual service (#239) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP * remote virtual service * fix: secret gen for kyma (#240) Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Dynamic Informers watches manifest instead of all resources (#244) * - add patch for gateway namespace - remove VirtualService - watches manifest instead of all resources under operator group * let dynamic informers to only watch manifest * remove patch comment * remove redundant array init * Fix watcher bugs for load test (#246) * ignore go.work files * fix virtual service deletion bug * rm unused method * fix watcher false ready state * make helm value overwrite working * fix loadbalancer creation and update * fix gateway error * fix: failing logic and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> * fix: merge conflicts for add_watcher (#252) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * fix: secret gen for kyma (#240) * Advance the Documentation of local setup (#248) * Fixed some links in readme doc * Added missing doc stuff Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com> * patch for load test * adjust reconciler interval add istio sidecar * - add v1 path to AuthorizationPolicy - remove gateway - enable namespace istio injection - * disable watcher in default * remove unnecessary patch * bring back gateway * rename gateway for kcp Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Ali Khlifi <46890720+khlifi411@users.noreply.github.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com>
* add KCP watcher controller and tests (#224) * add KCP watcher controller and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> * Dynamically create Virtual Service resource for watcher reconciler (#231) * add KCP watcher controller and tests * refactor and fix tests * further refactoring and fixes * fix Dockerfile and update dependencies * remove skipped tests * refactor tests * add watcher crd and fix module info state * fix tests and lint issues * - update Dockerfile * - add missing watcher.yaml * - update watcher yaml * - update gomod * add args enable-kcp-watcher patch * create virtual service resource if it doesn't exist * clean up virtual service vars and params * apply review suggestions * change contract version from 1 to v1 Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Xin Ruan <xin.ruan@sap.com> * fix: e2e watcher integration (#236) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: remove virtual service (#239) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP * remote virtual service * fix: secret gen for kyma (#240) Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Dynamic Informers watches manifest instead of all resources (#244) * - add patch for gateway namespace - remove VirtualService - watches manifest instead of all resources under operator group * let dynamic informers to only watch manifest * remove patch comment * remove redundant array init * Fix watcher bugs for load test (#246) * ignore go.work files * fix virtual service deletion bug * rm unused method * fix watcher false ready state * make helm value overwrite working * fix loadbalancer creation and update * fix gateway error * fix: failing logic and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> * fix: merge conflicts for add_watcher (#252) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * fix: secret gen for kyma (#240) * Advance the Documentation of local setup (#248) * Fixed some links in readme doc * Added missing doc stuff Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com> * patch for load test * adjust reconciler interval add istio sidecar * - add v1 path to AuthorizationPolicy - remove gateway - enable namespace istio injection - * disable watcher in default * remove unnecessary patch * bring back gateway * rename gateway for kcp * overwrite SkrWebhookMemoryLimits and SkrWebhookCPULimits * disable catalog sync for load test * add watcher patch * add missing config Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Ali Khlifi <46890720+khlifi411@users.noreply.github.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com>
* add KCP watcher controller and tests (#224) * add KCP watcher controller and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> * Dynamically create Virtual Service resource for watcher reconciler (#231) * add KCP watcher controller and tests * refactor and fix tests * further refactoring and fixes * fix Dockerfile and update dependencies * remove skipped tests * refactor tests * add watcher crd and fix module info state * fix tests and lint issues * - update Dockerfile * - add missing watcher.yaml * - update watcher yaml * - update gomod * add args enable-kcp-watcher patch * create virtual service resource if it doesn't exist * clean up virtual service vars and params * apply review suggestions * change contract version from 1 to v1 Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Xin Ruan <xin.ruan@sap.com> * fix: e2e watcher integration (#236) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: remove virtual service (#239) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * fix: e2e watcher integration * further fixes * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * dyncmic ingress external IP * remote virtual service * fix: secret gen for kyma (#240) Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Dynamic Informers watches manifest instead of all resources (#244) * - add patch for gateway namespace - remove VirtualService - watches manifest instead of all resources under operator group * let dynamic informers to only watch manifest * remove patch comment * remove redundant array init * Fix watcher bugs for load test (#246) * ignore go.work files * fix virtual service deletion bug * rm unused method * fix watcher false ready state * make helm value overwrite working * fix loadbalancer creation and update * fix gateway error * fix: failing logic and tests Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> * fix: merge conflicts for add_watcher (#252) * Refactor load_test as dedicate kustomize build instead of component (#232) * refactor load_test as dedicate kustomize build * remove load-test-deploy command * Update operator/config/load_test/kustomization.yaml Co-authored-by: Xin Ruan <ruanxin1@gmail.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * docs: refactor and improve environment setup (#219) * refactor and improve docs * connect docs and further refinement * review comments * fix: secret gen for kyma (#240) * Advance the Documentation of local setup (#248) * Fixed some links in readme doc * Added missing doc stuff Co-authored-by: Xin Ruan <xin.ruan@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com> * patch for load test * adjust reconciler interval add istio sidecar * - add v1 path to AuthorizationPolicy - remove gateway - enable namespace istio injection - * disable watcher in default * remove unnecessary patch * bring back gateway * rename gateway for kcp * overwrite SkrWebhookMemoryLimits and SkrWebhookCPULimits * disable catalog sync for load test * add watcher patch * add missing config * replace path with patch Co-authored-by: Aditya Bhatia <aditya.bhatia@sap.com> Co-authored-by: Ali Khlifi <46890720+khlifi411@users.noreply.github.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Jeremy Harisch <48282931+jeremyharisch@users.noreply.github.com>
No description provided.