Skip to content

Commit

Permalink
Merge pull request 'Ref #27576: allow to override instance using cook…
Browse files Browse the repository at this point in the history
…ie and query param' (#5) from feature/27576/access-old into develop
  • Loading branch information
LEDfan committed Aug 11, 2022
2 parents f6563be + 61c02f1 commit 8ca5cb0
Show file tree
Hide file tree
Showing 26 changed files with 1,358 additions and 294 deletions.
6 changes: 4 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true


[*.kt]
ij_kotlin_call_parameters_new_line_after_left_paren = false
ij_kotlin_call_parameters_right_paren_on_new_line = false
ij_kotlin_method_parameters_new_line_after_left_paren = false
ij_kotlin_method_parameters_right_paren_on_new_line = false
ij_any_wrap_long_lines = false
ij_formatter_off_tag = "@formatter:off"
ij_formatter_on_tag = "@formatter:on"
ij_kotlin_name_count_to_use_star_import = 50000
ij_kotlin_name_count_to_use_star_import_for_members = 50000
ij_formatter_tags_enabled = true
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
max_line_length = 256
indent_style = space
indent_size = 4
Expand Down
3 changes: 3 additions & 0 deletions docs/deployment/bases/clustered/operator/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ rules:
- apiGroups: [ "extensions" ]
resources: [ "replicasets" ]
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
- apiGroups: [ "zalando.org" ]
resources: [ "routegroups" ]
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ resources:
- serviceaccount.yaml
- daemonset.yaml
- service.yaml
- routegroups.crd.yaml
206 changes: 206 additions & 0 deletions docs/deployment/bases/clustered/skipper-ds/routegroups.crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
name: routegroups.zalando.org
spec:
group: zalando.org
names:
categories:
- all
kind: RouteGroup
listKind: RouteGroupList
plural: routegroups
shortNames:
- rg
- rgs
singular: routegroup
scope: Namespaced
versions:
- additionalPrinterColumns:
- description: Hosts defined for the RouteGroup
jsonPath: .spec.hosts
name: Hosts
type: string
- description: Address of the Load Balancer for the RouteGroup
jsonPath: .status.loadBalancer
name: Address
type: string
name: v1
schema:
openAPIV3Schema:
properties:
apiVersion:
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'
type: string
kind:
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'
type: string
metadata:
type: object
spec:
properties:
backends:
description: List of backends that can be referenced in the routes.
items:
properties:
address:
description: Address is required for Type network
type: string
algorithm:
description: Algorithm is required for Type lb
enum:
- roundRobin
- random
- consistentHash
- powerOfRandomNChoices
type: string
endpoints:
description: Endpoints is required for Type lb
items:
type: string
minItems: 1
type: array
name:
description: Name is the BackendName that can be referenced as RouteGroupBackendReference
type: string
serviceName:
description: ServiceName is required for Type service
type: string
servicePort:
description: ServicePort is required for Type service
type: integer
type:
description: Type is one of "service|shunt|loopback|dynamic|lb|network"
enum:
- service
- shunt
- loopback
- dynamic
- lb
- network
type: string
required:
- name
- type
type: object
type: array
defaultBackends:
description: DefaultBackends is a list of default backends defined if no explicit backend is defined for a route.
items:
properties:
backendName:
description: BackendName references the skipperBackend by name
type: string
weight:
description: Weight defines the traffic weight, if there are 2 or more default backends
minimum: 0
type: integer
required:
- backendName
type: object
type: array
hosts:
description: List of hostnames for the RouteGroup.
items:
pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
type: string
type: array
routes:
items:
properties:
backends:
description: RouteGroupBackendReference specifies the list of backendReference that should be applied to override the defaultBackends
items:
properties:
backendName:
description: BackendName references the skipperBackend by name
type: string
weight:
description: Weight defines the traffic weight, if there are 2 or more default backends
minimum: 0
type: integer
required:
- backendName
type: object
type: array
filters:
description: Filters specifies the list of filters applied to the routeSpec
items:
type: string
type: array
methods:
description: Methods defines valid HTTP methods for the specified routeSpec
items:
description: HTTPMethod is a valid HTTP method in uppercase.
enum:
- GET
- HEAD
- POST
- PUT
- PATCH
- DELETE
- CONNECT
- OPTIONS
- TRACE
type: string
type: array
path:
description: Path specifies Path predicate, only one of Path or PathSubtree is allowed
type: string
pathRegexp:
description: PathRegexp can be added additionally
type: string
pathSubtree:
description: PathSubtree specifies PathSubtree predicate, only one of Path or PathSubtree is allowed
type: string
predicates:
description: Predicates specifies the list of predicates applied to the routeSpec
items:
type: string
type: array
type: object
minItems: 1
type: array
required:
- backends
type: object
status:
properties:
loadBalancer:
description: LoadBalancer is similar to ingress status, such that external-dns has the same style as in ingress
properties:
routegroup:
description: RouteGroup is similar to Ingress in ingress status.LoadBalancer.
items:
properties:
hostname:
description: Hostname is the hostname of the load balancer and is empty if IP is set
type: string
ip:
description: IP is the IP address of the load balancer and is empty if Hostname is set
type: string
type: object
type: array
required:
- routegroup
type: object
required:
- loadBalancer
type: object
required:
- spec
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ resources:
- deployment.yaml
- service.yaml
- hpa.yaml
- routegroups.crd.yaml
Loading

0 comments on commit 8ca5cb0

Please sign in to comment.