Skip to content

Commit 8ca5cb0

Browse files
LEDfanLEDfan
committed
Merge pull request 'Ref #27576: allow to override instance using cookie and query param' (#5) from feature/27576/access-old into develop
2 parents f6563be + 61c02f1 commit 8ca5cb0

26 files changed

Lines changed: 1358 additions & 294 deletions

‎.editorconfig‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@ end_of_line = lf
55
trim_trailing_whitespace = true
66
insert_final_newline = true
77

8+
89
[*.kt]
910
ij_kotlin_call_parameters_new_line_after_left_paren = false
1011
ij_kotlin_call_parameters_right_paren_on_new_line = false
1112
ij_kotlin_method_parameters_new_line_after_left_paren = false
1213
ij_kotlin_method_parameters_right_paren_on_new_line = false
1314
ij_any_wrap_long_lines = false
14-
ij_formatter_off_tag = "@formatter:off"
15-
ij_formatter_on_tag = "@formatter:on"
1615
ij_kotlin_name_count_to_use_star_import = 50000
1716
ij_kotlin_name_count_to_use_star_import_for_members = 50000
17+
ij_formatter_tags_enabled = true
18+
ij_formatter_off_tag = @formatter:off
19+
ij_formatter_on_tag = @formatter:on
1820
max_line_length = 256
1921
indent_style = space
2022
indent_size = 4

‎docs/deployment/bases/clustered/operator/serviceaccount.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ rules:
3535
- apiGroups: [ "extensions" ]
3636
resources: [ "replicasets" ]
3737
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
38+
- apiGroups: [ "zalando.org" ]
39+
resources: [ "routegroups" ]
40+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
3841
---
3942
kind: ClusterRoleBinding
4043
apiVersion: rbac.authorization.k8s.io/v1

‎docs/deployment/bases/clustered/skipper-ds/kustomization.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ resources:
44
- serviceaccount.yaml
55
- daemonset.yaml
66
- service.yaml
7+
- routegroups.crd.yaml

‎docs/deployment/bases/clustered/skipper-ds/routegroups.crd.yaml‎

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
2+
---
3+
apiVersion: apiextensions.k8s.io/v1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
controller-gen.kubebuilder.io/version: v0.4.0
8+
name: routegroups.zalando.org
9+
spec:
10+
group: zalando.org
11+
names:
12+
categories:
13+
- all
14+
kind: RouteGroup
15+
listKind: RouteGroupList
16+
plural: routegroups
17+
shortNames:
18+
- rg
19+
- rgs
20+
singular: routegroup
21+
scope: Namespaced
22+
versions:
23+
- additionalPrinterColumns:
24+
- description: Hosts defined for the RouteGroup
25+
jsonPath: .spec.hosts
26+
name: Hosts
27+
type: string
28+
- description: Address of the Load Balancer for the RouteGroup
29+
jsonPath: .status.loadBalancer
30+
name: Address
31+
type: string
32+
name: v1
33+
schema:
34+
openAPIV3Schema:
35+
properties:
36+
apiVersion:
37+
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
38+
type: string
39+
kind:
40+
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
41+
type: string
42+
metadata:
43+
type: object
44+
spec:
45+
properties:
46+
backends:
47+
description: List of backends that can be referenced in the routes.
48+
items:
49+
properties:
50+
address:
51+
description: Address is required for Type network
52+
type: string
53+
algorithm:
54+
description: Algorithm is required for Type lb
55+
enum:
56+
- roundRobin
57+
- random
58+
- consistentHash
59+
- powerOfRandomNChoices
60+
type: string
61+
endpoints:
62+
description: Endpoints is required for Type lb
63+
items:
64+
type: string
65+
minItems: 1
66+
type: array
67+
name:
68+
description: Name is the BackendName that can be referenced as RouteGroupBackendReference
69+
type: string
70+
serviceName:
71+
description: ServiceName is required for Type service
72+
type: string
73+
servicePort:
74+
description: ServicePort is required for Type service
75+
type: integer
76+
type:
77+
description: Type is one of "service|shunt|loopback|dynamic|lb|network"
78+
enum:
79+
- service
80+
- shunt
81+
- loopback
82+
- dynamic
83+
- lb
84+
- network
85+
type: string
86+
required:
87+
- name
88+
- type
89+
type: object
90+
type: array
91+
defaultBackends:
92+
description: DefaultBackends is a list of default backends defined if no explicit backend is defined for a route.
93+
items:
94+
properties:
95+
backendName:
96+
description: BackendName references the skipperBackend by name
97+
type: string
98+
weight:
99+
description: Weight defines the traffic weight, if there are 2 or more default backends
100+
minimum: 0
101+
type: integer
102+
required:
103+
- backendName
104+
type: object
105+
type: array
106+
hosts:
107+
description: List of hostnames for the RouteGroup.
108+
items:
109+
pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
110+
type: string
111+
type: array
112+
routes:
113+
items:
114+
properties:
115+
backends:
116+
description: RouteGroupBackendReference specifies the list of backendReference that should be applied to override the defaultBackends
117+
items:
118+
properties:
119+
backendName:
120+
description: BackendName references the skipperBackend by name
121+
type: string
122+
weight:
123+
description: Weight defines the traffic weight, if there are 2 or more default backends
124+
minimum: 0
125+
type: integer
126+
required:
127+
- backendName
128+
type: object
129+
type: array
130+
filters:
131+
description: Filters specifies the list of filters applied to the routeSpec
132+
items:
133+
type: string
134+
type: array
135+
methods:
136+
description: Methods defines valid HTTP methods for the specified routeSpec
137+
items:
138+
description: HTTPMethod is a valid HTTP method in uppercase.
139+
enum:
140+
- GET
141+
- HEAD
142+
- POST
143+
- PUT
144+
- PATCH
145+
- DELETE
146+
- CONNECT
147+
- OPTIONS
148+
- TRACE
149+
type: string
150+
type: array
151+
path:
152+
description: Path specifies Path predicate, only one of Path or PathSubtree is allowed
153+
type: string
154+
pathRegexp:
155+
description: PathRegexp can be added additionally
156+
type: string
157+
pathSubtree:
158+
description: PathSubtree specifies PathSubtree predicate, only one of Path or PathSubtree is allowed
159+
type: string
160+
predicates:
161+
description: Predicates specifies the list of predicates applied to the routeSpec
162+
items:
163+
type: string
164+
type: array
165+
type: object
166+
minItems: 1
167+
type: array
168+
required:
169+
- backends
170+
type: object
171+
status:
172+
properties:
173+
loadBalancer:
174+
description: LoadBalancer is similar to ingress status, such that external-dns has the same style as in ingress
175+
properties:
176+
routegroup:
177+
description: RouteGroup is similar to Ingress in ingress status.LoadBalancer.
178+
items:
179+
properties:
180+
hostname:
181+
description: Hostname is the hostname of the load balancer and is empty if IP is set
182+
type: string
183+
ip:
184+
description: IP is the IP address of the load balancer and is empty if Hostname is set
185+
type: string
186+
type: object
187+
type: array
188+
required:
189+
- routegroup
190+
type: object
191+
required:
192+
- loadBalancer
193+
type: object
194+
required:
195+
- spec
196+
type: object
197+
served: true
198+
storage: true
199+
subresources:
200+
status: {}
201+
status:
202+
acceptedNames:
203+
kind: ""
204+
plural: ""
205+
conditions: []
206+
storedVersions: []

‎docs/deployment/bases/clustered/skipper-hpa/kustomization.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ resources:
55
- deployment.yaml
66
- service.yaml
77
- hpa.yaml
8+
- routegroups.crd.yaml

0 commit comments

Comments
 (0)