Skip to content
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

Merged
merged 5 commits into from
Sep 13, 2017

Conversation

mandarjog
Copy link
Contributor

@mandarjog mandarjog commented Sep 11, 2017

Mixer2 quota requires a different type of config.
This updates the config and uses a Mixer build that supports that config.

Release note:

NONE

@istio-merge-robot
Copy link

@mandarjog PR needs rebase

@istio-merge-robot istio-merge-robot added the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 11, 2017
spec:
quotas:
- name: requestcount.quota.istio-config-default
max_amount: 5000
Copy link
Contributor

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.

Copy link
Contributor Author

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
Copy link
Contributor

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

Copy link
Contributor Author

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"
Copy link
Contributor

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?

Copy link
Contributor Author

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.

Copy link
Contributor

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:
Copy link
Contributor

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.

Copy link
Contributor Author

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:
Copy link
Contributor

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.

Copy link
Contributor Author

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:
Copy link
Contributor

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?

Copy link
Contributor Author

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.

Copy link
Contributor

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.

Copy link
Contributor

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.

@ldemailly
Copy link
Contributor

what do we need to do so people type something instead of "<PLEASE PUT RELEASE-NOTE HERE, PUT NONE if NO RELEASE-NOTE>"

Copy link
Contributor

@ldemailly ldemailly left a 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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^^

Copy link
Contributor Author

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.

@istio-merge-robot
Copy link

@mandarjog PR needs rebase

@istio-merge-robot istio-merge-robot added the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 11, 2017
@mandarjog
Copy link
Contributor Author

Tests Summary
PASSED: //tests/e2e/tests/mixer:go_default_test 
PASSED: //tests/e2e/tests/bookinfo:go_default_test 

This PR with the correct Mixer build passes.

@mandarjog
Copy link
Contributor Author

@rshriram @ldemailly let's merge this please.
This is required for tests to pass at head of mixer.
It includes commits from #775

@douglas-reid
Copy link
Contributor

/lgtm

@istio-merge-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@istio-merge-robot
Copy link

/lgtm cancel //PR changed after LGTM, removing LGTM. @douglas-reid @mandarjog

@ldemailly
Copy link
Contributor

/retest

@istio istio deleted a comment from istio-testing Sep 13, 2017
@ldemailly
Copy link
Contributor

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)
Copy link
Contributor

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

Copy link
Contributor Author

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.

@douglas-reid
Copy link
Contributor

private cluster testing:

****************************************************
Tests Summary
PASSED: //tests/e2e/tests/mixer:go_default_test
PASSED: //tests/e2e/tests/bookinfo:go_default_test

@mandarjog
Copy link
Contributor Author

/retest

@douglas-reid douglas-reid added this to the Istio 0.2 milestone Sep 13, 2017
@douglas-reid
Copy link
Contributor

/lgtm

@istio-merge-robot
Copy link

[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 /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@istio-merge-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@istio-testing
Copy link
Collaborator

istio-testing commented Sep 13, 2017

@mandarjog: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
prow/new-e2e-rbac_no_auth.sh ad30540 link /test new-e2e-rbac_no_auth

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.

@istio-merge-robot
Copy link

Automatic merge from submit-queue

@istio-merge-robot istio-merge-robot merged commit a5bda88 into istio:master Sep 13, 2017
mandarjog pushed a commit to mandarjog/istio that referenced this pull request Oct 30, 2017
Former-commit-id: 1acd77e02c2c1b58f3aeb465712e623514785e29
rshriram pushed a commit that referenced this pull request Oct 30, 2017
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
@mandarjog mandarjog deleted the quota2 branch October 30, 2017 21:07
mandarjog pushed a commit that referenced this pull request Oct 31, 2017
Former-commit-id: b50f4b0dabc98c7d988080971150bee5244636ec
vbatts pushed a commit to vbatts/istio that referenced this pull request Oct 31, 2017
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
mandarjog added a commit that referenced this pull request Nov 2, 2017
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
kyessenov pushed a commit to kyessenov/istio that referenced this pull request Aug 13, 2018
* 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.
kyessenov pushed a commit to kyessenov/istio that referenced this pull request Aug 13, 2018
howardjohn pushed a commit to howardjohn/istio that referenced this pull request Jan 12, 2020
* Fix args.wait not being used.

* Fix import.
0x01001011 pushed a commit to thedemodrive/istio that referenced this pull request Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants