mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-07-26 00:35:19 -04:00
helm: use patched yawol with support for subnet choice
Constellation requires a CIDR that only Kubernetes nodes live in. This is needed for cilium encryption. To make yawol LBs work, they need to be placed in a different subnet with their own CIDR. This patched version supports that.
This commit is contained in:
parent
1e987f6a85
commit
d8185fdafb
6 changed files with 33 additions and 12 deletions
|
@ -100,6 +100,10 @@ spec:
|
||||||
networkID:
|
networkID:
|
||||||
description: NetworkID defines an openstack ID for the network.
|
description: NetworkID defines an openstack ID for the network.
|
||||||
type: string
|
type: string
|
||||||
|
subnetworkID:
|
||||||
|
description: SubnetworkID defines an openstack ID for the
|
||||||
|
subnetwork.
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- networkID
|
- networkID
|
||||||
type: object
|
type: object
|
||||||
|
|
|
@ -131,6 +131,10 @@ spec:
|
||||||
networkID:
|
networkID:
|
||||||
description: NetworkID defines an openstack ID for the network.
|
description: NetworkID defines an openstack ID for the network.
|
||||||
type: string
|
type: string
|
||||||
|
subnetworkID:
|
||||||
|
description: SubnetworkID defines an openstack ID for the
|
||||||
|
subnetwork.
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- networkID
|
- networkID
|
||||||
type: object
|
type: object
|
||||||
|
|
|
@ -165,6 +165,10 @@ spec:
|
||||||
description: NetworkID defines an openstack ID for
|
description: NetworkID defines an openstack ID for
|
||||||
the network.
|
the network.
|
||||||
type: string
|
type: string
|
||||||
|
subnetworkID:
|
||||||
|
description: SubnetworkID defines an openstack ID
|
||||||
|
for the subnetwork.
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- networkID
|
- networkID
|
||||||
type: object
|
type: object
|
||||||
|
|
|
@ -61,6 +61,10 @@ spec:
|
||||||
- name: NETWORK_ID
|
- name: NETWORK_ID
|
||||||
value: {{ .Values.yawolNetworkID }}
|
value: {{ .Values.yawolNetworkID }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.yawolSubnetworkID }}
|
||||||
|
- name: SUBNETWORK_ID
|
||||||
|
value: {{ .Values.yawolSubnetworkID }}
|
||||||
|
{{- end }}
|
||||||
{{- if .Values.yawolFlavorID }}
|
{{- if .Values.yawolFlavorID }}
|
||||||
- name: FLAVOR_ID
|
- name: FLAVOR_ID
|
||||||
value: {{ .Values.yawolFlavorID }}
|
value: {{ .Values.yawolFlavorID }}
|
||||||
|
|
|
@ -20,9 +20,8 @@ yawolCloudController:
|
||||||
annotations: {}
|
annotations: {}
|
||||||
labels: {}
|
labels: {}
|
||||||
image:
|
image:
|
||||||
repository: ghcr.io/stackitcloud/yawol/yawol-cloud-controller
|
repository: ghcr.io/malt3/yawol/yawol-cloud-controller
|
||||||
# -- Allows you to override the yawol version in this chart. Use at your own risk.
|
tag: "yawol-controller-0.20.0-4-g6212876@sha256:ad83538fadc5d367700f75fc71c67697338307fdd81214dfc99b4cf425b8cb30"
|
||||||
tag: ""
|
|
||||||
|
|
||||||
yawolController:
|
yawolController:
|
||||||
gardenerMonitoringEnabled: false
|
gardenerMonitoringEnabled: false
|
||||||
|
@ -32,9 +31,8 @@ yawolController:
|
||||||
annotations: {}
|
annotations: {}
|
||||||
labels: {}
|
labels: {}
|
||||||
image:
|
image:
|
||||||
repository: ghcr.io/stackitcloud/yawol/yawol-controller
|
repository: ghcr.io/malt3/yawol/yawol-controller
|
||||||
# -- Allows you to override the yawol version in this chart. Use at your own risk.
|
tag: "yawol-controller-0.20.0-4-g6212876@sha256:290250a851de2cf4cb6eab2d40b36724c8321b7c3c36da80fd3e2333ed6808d0"
|
||||||
tag: ""
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
yawolCloudController:
|
yawolCloudController:
|
||||||
|
@ -86,6 +84,12 @@ yawolFloatingID:
|
||||||
# Placed in LoadBalancer.spec.infrastructure.networkID
|
# Placed in LoadBalancer.spec.infrastructure.networkID
|
||||||
yawolNetworkID:
|
yawolNetworkID:
|
||||||
|
|
||||||
|
# OpenStack subnetwork ID in which the Load Balancer is placed.
|
||||||
|
# If not set, the subnetwork is chosen automatically.
|
||||||
|
#
|
||||||
|
# Placed in LoadBalancer.spec.infrastructure.subnetworkID
|
||||||
|
yawolSubnetworkID:
|
||||||
|
|
||||||
# default value for flavor that yawol Load Balancer instances should use
|
# default value for flavor that yawol Load Balancer instances should use
|
||||||
# can be overridden by annotation
|
# can be overridden by annotation
|
||||||
#
|
#
|
||||||
|
|
|
@ -170,6 +170,7 @@ func extraYawolValues(serviceAccURI string, output state.Infrastructure, openSta
|
||||||
"yawolFlavorID": openStackCfg.YawolFlavorID,
|
"yawolFlavorID": openStackCfg.YawolFlavorID,
|
||||||
"yawolImageID": openStackCfg.YawolImageID,
|
"yawolImageID": openStackCfg.YawolImageID,
|
||||||
"yawolNetworkID": output.OpenStack.NetworkID,
|
"yawolNetworkID": output.OpenStack.NetworkID,
|
||||||
|
"yawolSubnetworkID": output.OpenStack.SubnetID,
|
||||||
"yawolAPIHost": fmt.Sprintf("https://%s:%d", output.InClusterEndpoint, constants.KubernetesPort),
|
"yawolAPIHost": fmt.Sprintf("https://%s:%d", output.InClusterEndpoint, constants.KubernetesPort),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue