Skip to content

k8s-ingress
k8s-ingress
Commit a194ac2e authored by Geoff Simmons's avatar Geoff Simmons
Browse files
Options

Update the API group for the CRDs to apiextensions.k8s.io/v1.

parent 7c568dce
Hide whitespace changes
Inline Side-by-side
Showing with 571 additions and 568 deletions
charts/viking-controller/crds/backendcfg-crd.yaml
View file @ a194ac2e
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: backendconfigs.ingress.varnish-cache.org
......@@ -12,138 +12,139 @@ spec:
shortNames:
- becfg
scope: Namespaced
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
validation:
openAPIV3Schema:
required:
- spec
properties:
spec:
required:
- services
properties:
services:
type: array
minItems: 1
items:
schema:
openAPIV3Schema:
type: object
required:
- spec
properties:
spec:
type: object
required:
- services
properties:
services:
type: array
minItems: 1
items:
type: string
minLength: 1
host-header:
type: string
minLength: 1
host-header:
type: string
minLength: 1
connect-timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
first-byte-timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
between-bytes-timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
dnsRetryDelay:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
domainUsageTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
firstLookupTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
resolverIdleTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
resolverTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
proxy-header:
type: integer
minimum: 1
maximum: 2
max-connections:
type: integer
minimum: 1
maxDNSQueries:
type: integer
minimum: 0
maximum: 65535
followDNSRedirects:
type: boolean
probe:
type: object
properties:
url:
type: string
pattern: ^/
request:
type: array
minItems: 1
items:
connect-timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
first-byte-timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
between-bytes-timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
dnsRetryDelay:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
domainUsageTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
firstLookupTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
resolverIdleTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
resolverTimeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
proxy-header:
type: integer
minimum: 1
maximum: 2
max-connections:
type: integer
minimum: 1
maxDNSQueries:
type: integer
minimum: 0
maximum: 65535
followDNSRedirects:
type: boolean
probe:
type: object
properties:
url:
type: string
expected-response:
type: integer
minimum: 100
maximum: 599
timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
interval:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
initial:
type: integer
minimum: 0
window:
type: integer
minimum: 0
maximum: 64
threshold:
type: integer
minimum: 0
maximum: 64
director:
type: object
properties:
type:
enum:
- round-robin
- random
- shard
type: string
warmup:
type: integer
minimum: 0
maximum: 100
rampup:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
tls:
type: object
properties:
verify:
type: boolean
authority:
type: string
caSecret:
type: string
minLength: 1
caCrt:
type: string
minLength: 1
caIssuer:
type: string
minLength: 1
maxConn:
type: integer
minimum: 1
maximum: 2147483647
stickTableSize:
type: integer
minimum: 1
maximum: 2147483647
pattern: ^/
request:
type: array
minItems: 1
items:
type: string
expected-response:
type: integer
minimum: 100
maximum: 599
timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
interval:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
initial:
type: integer
minimum: 0
window:
type: integer
minimum: 0
maximum: 64
threshold:
type: integer
minimum: 0
maximum: 64
director:
type: object
properties:
type:
enum:
- round-robin
- random
- shard
type: string
warmup:
type: integer
minimum: 0
maximum: 100
rampup:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
tls:
type: object
properties:
verify:
type: boolean
authority:
type: string
caSecret:
type: string
minLength: 1
caCrt:
type: string
minLength: 1
caIssuer:
type: string
minLength: 1
maxConn:
type: integer
minimum: 1
maximum: 2147483647
stickTableSize:
type: integer
minimum: 1
maximum: 2147483647
status:
acceptedNames:
kind: BackendConfig
......
charts/viking-controller/crds/templatecfg-crd.yaml
View file @ a194ac2e
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: templateconfigs.ingress.varnish-cache.org
......@@ -13,36 +13,37 @@ spec:
- tmplcfg
- tmplcfgs
scope: Namespaced
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
validation:
openAPIV3Schema:
required:
- spec
properties:
spec:
properties:
ingress:
type: string
minLength: 1
acl:
type: string
minLength: 1
auth:
type: string
minLength: 1
reqDisp:
type: string
minLength: 1
rewrite:
type: string
minLength: 1
shard:
type: string
minLength: 1
schema:
openAPIV3Schema:
type: object
required:
- spec
properties:
spec:
type: object
properties:
ingress:
type: string
minLength: 1
acl:
type: string
minLength: 1
auth:
type: string
minLength: 1
reqDisp:
type: string
minLength: 1
rewrite:
type: string
minLength: 1
shard:
type: string
minLength: 1
status:
acceptedNames:
kind: TemplateConfig
......
charts/viking-controller/crds/varnishcfg-crd.yaml
View file @ a194ac2e
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: varnishconfigs.ingress.varnish-cache.org
......@@ -12,453 +12,454 @@ spec:
shortNames:
- vcfg
scope: Namespaced
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
validation:
openAPIV3Schema:
required:
- spec
properties:
spec:
required:
- services
properties:
services:
type: array
minItems: 1
items:
type: string
self-sharding:
type: object
required:
- rules
properties:
probe:
type: object
properties:
timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
interval:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
initial:
type: integer
minimum: 0
window:
type: integer
minimum: 0
maximum: 64
threshold:
type: integer
minimum: 0
maximum: 64
max-secondary-ttl:
schema:
openAPIV3Schema:
type: object
required:
- spec
properties:
spec:
type: object
required:
- services
properties:
services:
type: array
minItems: 1
items:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
rules:
type: array
minItems: 1
items:
self-sharding:
type: object
required:
- rules
properties:
probe:
type: object
required:
- shard
properties:
shard:
type: object
properties:
primaryOnly:
type: boolean
key:
type: string
pattern: "^client\\.identity$|^req\\.(url|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
digest:
type: string
enum:
- CRC32
- ICRC32
- MD5
- RS
- SHA1
- SHA224
- SHA256
- SHA384
- SHA512
- SHA3_224
- SHA3_256
- SHA3_512
conditions:
type: array
minItems: 1
items:
timeout:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
interval:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
initial:
type: integer
minimum: 0
window:
type: integer
minimum: 0
maximum: 64
threshold:
type: integer
minimum: 0
maximum: 64
max-secondary-ttl:
type: string
pattern: '^\d+(\.\d+)?(ms|[smhdwy])$'
rules:
type: array
minItems: 1
items:
type: object
required:
- shard
properties:
shard:
type: object
required:
- comparand
properties:
comparand:
primaryOnly:
type: boolean
key:
type: string
pattern: "^req\\.(url|method|proto|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
pattern: "^client\\.identity$|^req\\.(url|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
digest:
type: string
enum:
- equal
- not-equal
- match
- not-match
- prefix
- not-prefix
- exists
- not-exists
values:
type: array
minItems: 1
items:
- CRC32
- ICRC32
- MD5
- RS
- SHA1
- SHA224
- SHA256
- SHA384
- SHA512
- SHA3_224
- SHA3_256
- SHA3_512
conditions:
type: array
minItems: 1
items:
type: object
required:
- comparand
properties:
comparand:
type: string
pattern: "^req\\.(url|method|proto|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
type: string
match-flags:
type: object
properties:
max-mem:
type: integer
minimum: 0
anchor:
enum:
- equal
- not-equal
- match
- not-match
- prefix
- not-prefix
- exists
- not-exists
values:
type: array
minItems: 1
items:
type: string
enum:
- none
- start
- both
utf8:
type: boolean
posix-syntax:
type: boolean
longest-match:
type: boolean
literal:
type: boolean
never-capture:
type: boolean
case-sensitive:
type: boolean
perl-classes:
type: boolean
word-boundary:
type: boolean
auth:
type: array
minItems: 1
items:
type: object
required:
- realm
- secretName
properties:
realm:
type: string
minLength: 1
secretName:
type: string
minLength: 1
type:
enum:
- basic
- proxy
type: string
utf8:
type: boolean
conditions:
type: array
minItems: 1
items:
match-flags:
type: object
properties:
max-mem:
type: integer
minimum: 0
anchor:
type: string
enum:
- none
- start
- both
utf8:
type: boolean
posix-syntax:
type: boolean
longest-match:
type: boolean
literal:
type: boolean
never-capture:
type: boolean
case-sensitive:
type: boolean
perl-classes:
type: boolean
word-boundary:
type: boolean
auth:
type: array
minItems: 1
items:
type: object
required:
- realm
- secretName
properties:
realm:
type: string
minLength: 1
secretName:
type: string
minLength: 1
type:
enum:
- basic
- proxy
type: string
utf8:
type: boolean
conditions:
type: array
minItems: 1
items:
type: object
required:
- comparand
- value
properties:
comparand:
type: string
pattern: "^req\\.(url|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
enum:
- equal
- not-equal
- match
- not-match
type: string
value:
type: string
minLength: 1
acl:
type: array
minItems: 1
items:
type: object
required:
- name
- addrs
properties:
name:
type: string
minLength: 1
addrs:
type: array
minItems: 1
items:
type: object
required:
- addr
properties:
addr:
type: string
pattern: '^[^"]+$'
mask-bits:
type: integer
minimum: 0
maximum: 128
negate:
type: boolean
type:
enum:
- whitelist
- blacklist
type: string
fail-status:
type: integer
minimum: 0
maximum: 599
comparand:
type: string
pattern: "^((client|server|local|remote)\\.ip|xff-(first|2ndlast)|req\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
conditions:
type: array
minItems: 1
items:
type: object
required:
- comparand
- value
properties:
comparand:
type: string
pattern: "^req\\.(url|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
enum:
- equal
- not-equal
- match
- not-match
type: string
value:
type: string
minLength: 1
result-header:
type: object
required:
- comparand
- value
- header
- success
- failure
properties:
comparand:
header:
type: string
pattern: "^req\\.(url|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
enum:
- equal
- not-equal
- match
- not-match
pattern: "^req\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+$"
success:
type: string
value:
minLength: 1
failure:
type: string
minLength: 1
acl:
type: array
minItems: 1
items:
type: object
required:
- name
- addrs
properties:
name:
type: string
minLength: 1
addrs:
type: array
minItems: 1
items:
vcl:
type: string
minLength: 1
rewrites:
type: array
minItems: 1
items:
type: object
required:
- target
- method
properties:
target:
type: string
pattern: "^(be)?(req\\.url|re(q|sp)\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
source:
type: string
pattern: "^(be)?(req\\.url|re(q|sp)\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
method:
type: string
enum:
- replace
- sub
- suball
- rewrite
- append
- prepend
- delete
select:
type: string
enum:
- unique
- first
- last
- exact
- longest
- shortest
compare:
type: string
enum:
- match
- equal
- prefix
vcl-sub:
type: string
enum:
- recv
- pipe
- pass
- hash
- purge
- miss
- hit
- deliver
- synth
- backend_fetch
- backend_response
- backend_error
rules:
type: array
minItems: 1
items:
type: object
properties:
rewrite:
type: string
minLength: 1
value:
type: string
minLength: 1
match-flags:
type: object
required:
- addr
properties:
addr:
type: string
pattern: '^[^"]+$'
mask-bits:
max-mem:
type: integer
minimum: 0
maximum: 128
negate:
type: boolean
type:
enum:
- whitelist
- blacklist
type: string
fail-status:
type: integer
minimum: 0
maximum: 599
comparand:
type: string
pattern: "^((client|server|local|remote)\\.ip|xff-(first|2ndlast)|req\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
conditions:
type: array
minItems: 1
items:
type: object
required:
- comparand
- value
properties:
comparand:
anchor:
type: string
pattern: "^req\\.(url|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
enum:
- equal
- not-equal
- match
- not-match
type: string
value:
type: string
minLength: 1
result-header:
type: object
required:
- header
- success
- failure
properties:
header:
type: string
pattern: "^req\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+$"
success:
type: string
minLength: 1
failure:
type: string
minLength: 1
vcl:
type: string
minLength: 1
rewrites:
type: array
minItems: 1
items:
type: object
required:
- target
- method
properties:
target:
type: string
pattern: "^(be)?(req\\.url|re(q|sp)\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
source:
type: string
pattern: "^(be)?(req\\.url|re(q|sp)\\.http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
method:
type: string
enum:
- replace
- sub
- suball
- rewrite
- append
- prepend
- delete
select:
type: string
enum:
- unique
- first
- last
- exact
- longest
- shortest
compare:
type: string
enum:
- match
- equal
- prefix
vcl-sub:
type: string
enum:
- recv
- pipe
- pass
- hash
- purge
- miss
- hit
- deliver
- synth
- backend_fetch
- backend_response
- backend_error
rules:
type: array
minItems: 1
items:
type: object
properties:
rewrite:
type: string
minLength: 1
value:
type: string
minLength: 1
match-flags:
type: object
properties:
max-mem:
type: integer
minimum: 0
anchor:
type: string
enum:
- none
- start
- both
utf8:
type: boolean
posix-syntax:
type: boolean
longest-match:
type: boolean
literal:
type: boolean
never-capture:
type: boolean
case-sensitive:
type: boolean
perl-classes:
type: boolean
word-boundary:
type: boolean
req-disposition:
type: array
minItems: 1
items:
type: object
required:
- conditions
- disposition
properties:
conditions:
type: array
minItems: 1
items:
- none
- start
- both
utf8:
type: boolean
posix-syntax:
type: boolean
longest-match:
type: boolean
literal:
type: boolean
never-capture:
type: boolean
case-sensitive:
type: boolean
perl-classes:
type: boolean
word-boundary:
type: boolean
req-disposition:
type: array
minItems: 1
items:
type: object
required:
- conditions
- disposition
properties:
conditions:
type: array
minItems: 1
items:
type: object
required:
- comparand
properties:
comparand:
type: string
pattern: "^req\\.(url|method|proto|esi_level|restarts|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
enum:
- equal
- not-equal
- match
- not-match
- prefix
- not-prefix
- exists
- not-exists
- greater
- greater-equal
- less
- less-equal
type: string
values:
type: array
minItems: 1
items:
type: string
count:
type: integer
minimum: 0
match-flags:
type: object
properties:
max-mem:
type: integer
minimum: 0
anchor:
type: string
enum:
- none
- start
- both
utf8:
type: boolean
posix-syntax:
type: boolean
longest-match:
type: boolean
literal:
type: boolean
never-capture:
type: boolean
case-sensitive:
type: boolean
perl-classes:
type: boolean
word-boundary:
type: boolean
disposition:
type: object
required:
- comparand
- action
properties:
comparand:
type: string
pattern: "^req\\.(url|method|proto|esi_level|restarts|http\\.[a-zA-Z0-9!#$%&'*+.^_`|~-]+)$"
compare:
action:
enum:
- equal
- not-equal
- match
- not-match
- prefix
- not-prefix
- exists
- not-exists
- greater
- greater-equal
- less
- less-equal
- hash
- pass
- pipe
- purge
- synth
- fail
- restart
type: string
values:
type: array
minItems: 1
items:
type: string
count:
status:
type: integer
minimum: 0
match-flags:
type: object
properties:
max-mem:
type: integer
minimum: 0
anchor:
type: string
enum:
- none
- start
- both
utf8:
type: boolean
posix-syntax:
type: boolean
longest-match:
type: boolean
literal:
type: boolean
never-capture:
type: boolean
case-sensitive:
type: boolean
perl-classes:
type: boolean
word-boundary:
type: boolean
disposition:
type: object
required:
- action
properties:
action:
enum:
- hash
- pass
- pipe
- purge
- synth
- fail
- restart
type: string
status:
type: integer
minimum: 200
maximum: 599
reason:
type: string
minLength: 1
minimum: 200
maximum: 599
reason:
type: string
minLength: 1
status:
acceptedNames:
kind: VarnishConfig
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment