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.

Sign up for GitHub

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

Jump to bottom

feat(hostnamegenerator): implement MeshExternalService support #10379

Merged
merged 15 commits into from
Jun 5, 2024
Merged

feat(hostnamegenerator): implement MeshExternalService support #10379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d0c9c62
feat(HostnameGenerator): generate hostnames
michaelbeaumont May 29, 2024
d92a6ec
test(HostnameGenerator): add basic tests
michaelbeaumont May 31, 2024
cf728c4
feat(HostnameGenerator): add validation
michaelbeaumont Jun 4, 2024
7a6ce85
feat(HostnameGenerator): handle collisions
michaelbeaumont Jun 4, 2024
b01d0be
test(HostnameGenerator): add collision test
michaelbeaumont Jun 4, 2024
e4964ac
Merge branch 'master' into feat/ms-hostname-generate
michaelbeaumont Jun 4, 2024
7edcf4f
refactor: use IPAM allocation interval
michaelbeaumont Jun 4, 2024
eac2d61
chore: imports and comment
michaelbeaumont Jun 4, 2024
cb1e494
feat: add service name to error
michaelbeaumont Jun 4, 2024
625edc4
refactor: don't track collisions between meshes
michaelbeaumont Jun 4, 2024
db0c77f
extract common model
lukidzi Jun 4, 2024
283b7d9
separated implementations for resources
lukidzi Jun 4, 2024
5b976f0
Merge branch 'master' into feat/mes-hostname-generate
lukidzi Jun 4, 2024
3cc5493
fix
lukidzi Jun 4, 2024
e538f30
feat(hostnamegenerator): post review changes
slonka Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 72 additions & 7 deletions app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,23 +485,79 @@ spec:
items:
properties:
hostname:
description: Hostname of the generated domain
type: string
hostnameGeneratorRef:
description: HostnameGeneratorRef informes which generator was
used
properties:
name:
type: string
required:
- name
type: object
origin:
description: Origin provides information what generated the
vip
type: string
type: object
type: array
hostnameGenerators:
items:
properties:
conditions:
description: Conditions is an array of hostname generator conditions.
items:
properties:
message:
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
reason:
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False,
Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- message
- reason
- status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
hostnameGeneratorRef:
properties:
name:
type: string
required:
- name
type: object
required:
- origin
- hostnameGeneratorRef
type: object
type: array
vip:
Expand Down Expand Up @@ -5120,7 +5176,7 @@ spec:
items:
properties:
conditions:
description: Conditions is an array of gateway instance conditions.
description: Conditions is an array of hostname generator conditions.
items:
properties:
message:
Expand Down Expand Up @@ -7243,6 +7299,15 @@ spec:
properties:
selector:
properties:
meshExternalService:
properties:
matchLabels:
additionalProperties:
type: string
type: object
matchName:
type: string
type: object
meshService:
properties:
matchLabels:
Expand Down
79 changes: 72 additions & 7 deletions app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,23 +485,79 @@ spec:
items:
properties:
hostname:
description: Hostname of the generated domain
type: string
hostnameGeneratorRef:
description: HostnameGeneratorRef informes which generator was
used
properties:
name:
type: string
required:
- name
type: object
origin:
description: Origin provides information what generated the
vip
type: string
type: object
type: array
hostnameGenerators:
items:
properties:
conditions:
description: Conditions is an array of hostname generator conditions.
items:
properties:
message:
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
reason:
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False,
Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- message
- reason
- status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
hostnameGeneratorRef:
properties:
name:
type: string
required:
- name
type: object
required:
- origin
- hostnameGeneratorRef
type: object
type: array
vip:
Expand Down Expand Up @@ -5120,7 +5176,7 @@ spec:
items:
properties:
conditions:
description: Conditions is an array of gateway instance conditions.
description: Conditions is an array of hostname generator conditions.
items:
properties:
message:
Expand Down Expand Up @@ -7243,6 +7299,15 @@ spec:
properties:
selector:
properties:
meshExternalService:
properties:
matchLabels:
additionalProperties:
type: string
type: object
matchName:
type: string
type: object
meshService:
properties:
matchLabels:
Expand Down
79 changes: 72 additions & 7 deletions app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,23 +505,79 @@ spec:
items:
properties:
hostname:
description: Hostname of the generated domain
type: string
hostnameGeneratorRef:
description: HostnameGeneratorRef informes which generator was
used
properties:
name:
type: string
required:
- name
type: object
origin:
description: Origin provides information what generated the
vip
type: string
type: object
type: array
hostnameGenerators:
items:
properties:
conditions:
description: Conditions is an array of hostname generator conditions.
items:
properties:
message:
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
reason:
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False,
Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- message
- reason
- status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
hostnameGeneratorRef:
properties:
name:
type: string
required:
- name
type: object
required:
- origin
- hostnameGeneratorRef
type: object
type: array
vip:
Expand Down Expand Up @@ -5140,7 +5196,7 @@ spec:
items:
properties:
conditions:
description: Conditions is an array of gateway instance conditions.
description: Conditions is an array of hostname generator conditions.
items:
properties:
message:
Expand Down Expand Up @@ -7263,6 +7319,15 @@ spec:
properties:
selector:
properties:
meshExternalService:
properties:
matchLabels:
additionalProperties:
type: string
type: object
matchName:
type: string
type: object
meshService:
properties:
matchLabels:
Expand Down
Loading
Loading