-
Notifications
You must be signed in to change notification settings - Fork 7.7k
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
Enable new style quota configuration in testing #725
Conversation
@mandarjog PR needs rebase |
spec: | ||
quotas: | ||
- name: requestcount.quota.istio-config-default | ||
max_amount: 5000 |
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.
nit: JSON normal form is maxAmount
, although proto parser is lenient.
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.
fixed.
valid_duration: 1s | ||
overrides: | ||
- dimensions: | ||
destination: ratings |
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.
Might be worth adding a comment what this means
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.
done
spec: | ||
dimensions: | ||
source: source.labels["app"] | "unknown" | ||
destination: destination.labels["apps"] | "unknown" |
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.
destination.name
also works, right?
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.
target.name: istio-ingress-2398531633-tj53n
is the pod hostname so you can't write rules based on it.
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.
Interesting, that sounds like a bug. "name" should "istio-ingress" here, the short name of the service.
valueType: STRING | ||
context.timestamp: | ||
valueType: TIMESTAMP | ||
context.time: |
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.
Why both time and timestamp? This also looks like a more consequential change than quota update.
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.
copied from the API repo.
@@ -84,4 +106,16 @@ spec: | |||
valueType: STRING | |||
target.serviceAccount: | |||
valueType: STRING | |||
destination.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.
Please add destination.port
if you are at it.
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.
needs to be done in the API repo first.
valueType: DURATION | ||
context.protocol: | ||
valueType: STRING | ||
context.timestamp: |
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.
the casing is all over place serviceAccount
, user-agent
and bytes_total
?
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.
Those I have just copied over from the API repo, let's see if we can fix it there.
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.
Can you point me to the source of truth? I'll file an issue.
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 need a pass at this anyway in istio/api.
what do we need to do so people type something instead of "<PLEASE PUT RELEASE-NOTE HERE, PUT NONE if NO RELEASE-NOTE>" |
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.
no random sha from a pr please
@@ -26,7 +26,7 @@ spec: | |||
spec: | |||
containers: | |||
- name: grafana | |||
image: gcr.io/istio-testing/grafana:1bc30a23190aa58635d02ff7fd31bf74de0d011e | |||
image: gcr.io/istio-testing/grafana:1af0c4d990ff6bb881c0243b802ed4a8d96f1a5a |
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.
^^^
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 PR needs at least the given level of Mixer. Once that PR is merged, I will remove the specific sha.
I will not merge this PR with this sha.
@mandarjog PR needs rebase |
This PR with the correct Mixer build passes. |
@rshriram @ldemailly let's merge this please. |
/lgtm |
/test all [submit-queue is verifying that this PR is safe to merge] |
/lgtm cancel //PR changed after LGTM, removing LGTM. @douglas-reid @mandarjog |
/retest |
failed with #777 |
} | ||
glog.Infof("promvalue := %s", value.String()) | ||
|
||
got, err := vectorValue(value, map[string]string{responseCodeLabel: "429"}) | ||
if err != nil { | ||
t.Logf("prometheus values for request_count:\n%s", promDump(promAPI, "request_count")) | ||
t.Fatalf("Could not find rate limit value: %v", err) | ||
fatalf(t, "Could not find rate limit value: %v", err) |
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 should not be fatal, should be errorf + got =0
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.
let's not change it in this PR.
private cluster testing:
|
/retest |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: douglas-reid The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
/test all [submit-queue is verifying that this PR is safe to merge] |
@mandarjog: The following test failed, say
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Automatic merge from submit-queue |
Former-commit-id: 1acd77e02c2c1b58f3aeb465712e623514785e29
Automatic merge from submit-queue Enable new style quota configuration in testing Mixer2 quota requires a different type of config. This updates the config and uses a Mixer build that supports that config. **Release note**: ```release-note NONE ``` Former-commit-id: a5bda88
Former-commit-id: b50f4b0dabc98c7d988080971150bee5244636ec
Automatic merge from submit-queue Enable new style quota configuration in testing Mixer2 quota requires a different type of config. This updates the config and uses a Mixer build that supports that config. **Release note**: ```release-note NONE ``` Former-commit-id: a5bda88
Automatic merge from submit-queue Enable new style quota configuration in testing Mixer2 quota requires a different type of config. This updates the config and uses a Mixer build that supports that config. **Release note**: ```release-note NONE ``` Former-commit-id: a5bda88
* Revert "Strip out "spiffe://" in the identity (istio#719)" This reverts commit 99a482f. * Revert "Revert "Remove -release in filename when doing release build of proxy (istio#704)" (istio#723)" This reverts commit 13669ce. * Revert "Not to send legacy quota for v2 config. (istio#722)" This reverts commit aaf25ca.
…istio#733) This reverts commit ef74122.
* Fix args.wait not being used. * Fix import.
Mixer2 quota requires a different type of config.
This updates the config and uses a Mixer build that supports that config.
Release note: