Browse Source

Merge pull request #1772 from datawire/flynn/dev/schema-tweak

Fix schema errors for Knative 0.8.0
Flynn 3 weeks ago
parent
commit
0d9b961097
No account linked to committer's email address

+ 1
- 0
ambassador/schemas/v0/AuthService.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v0/CircuitBreaker.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v0/Mapping.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v0/Module.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v0/OutlierDetection.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v0/RateLimitService.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v0/TracingService.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v0"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/AuthService.schema View File

@@ -4,6 +4,7 @@
4 4
     "type": "object",
5 5
     "properties": {
6 6
         "apiVersion": { "enum": ["ambassador/v1"] },
7
+        "generation": { "type": "integer" },
7 8
         "kind": { "type": "string" },
8 9
         "name": { "type": "string" },
9 10
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/Mapping.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v1"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/Module.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v1"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/RateLimitService.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v1"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/TCPMapping.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v1"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/TLSContext.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v1"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 1
- 0
ambassador/schemas/v1/TracingService.schema View File

@@ -5,6 +5,7 @@
5 5
     "type": "object",
6 6
     "properties": {
7 7
         "apiVersion": { "enum": ["ambassador/v1"] },
8
+        "generation": { "type": "integer" },
8 9
         "kind": { "type": "string" },
9 10
         "name": { "type": "string" },
10 11
         "ambassador_id": {

+ 5
- 5
ambassador/tests/t_circuitbreaker.py View File

@@ -195,13 +195,13 @@ config:
195 195
 
196 196
         # '-normal' mapping tests: global configuration should be in effect
197 197
         normal_overloaded = 0
198
-        printed = False
198
+        # printed = False
199 199
 
200 200
         for result in normal_mapping_results:
201
-            if not printed:
202
-                import json
203
-                print(json.dumps(result.as_dict(), sort_keys=True, indent=2))
204
-                printed = True
201
+            # if not printed:
202
+            #     import json
203
+            #     print(json.dumps(result.as_dict(), sort_keys=True, indent=2))
204
+            #     printed = True
205 205
 
206 206
             if 'X-Envoy-Overloaded' in result.headers:
207 207
                 normal_overloaded += 1

+ 3
- 0
kat/kat/harness.py View File

@@ -1097,6 +1097,9 @@ class Runner:
1097 1097
 
1098 1098
         self._wait(selected)
1099 1099
 
1100
+        print("Waiting 5s after requirements, just because...")
1101
+        time.sleep(5)
1102
+
1100 1103
     def _wait(self, selected):
1101 1104
         requirements = [ (node, kind, name) for node in self.nodes for kind, name in node.requirements()
1102 1105
                          if node in selected ]

Loading…
Cancel
Save