Skip to content

Remove yawol and kube-vip #203

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.

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

Merged
merged 3 commits into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 28 additions & 34 deletions docs/providers/openstack/configuration.md

Large diffs are not rendered by default.

28 changes: 1 addition & 27 deletions providers/openstack/scs/cluster-addon-values.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,16 @@
values: |
{{- define "yawol_image_id" -}}
{{- range .Cluster.spec.topology.variables -}}
{{- if eq .name "yawol_image_id" -}}
{{ .value }}
{{- end -}}
{{- end -}}
{{- end }}
{{- define "yawol_flavor_id" -}}
{{- range .Cluster.spec.topology.variables -}}
{{- if eq .name "yawol_flavor_id" -}}
{{ .value }}
{{- end -}}
{{- end -}}
{{- end }}
metrics-server:
commonLabels:
domain: "{{ .Cluster.spec.controlPlaneEndpoint.host }}"
clusterAddonVersion: "v2"
{{ range .Cluster.spec.topology.variables }}
{{- if and (eq .name "workload_loadbalancer") (eq .value "yawol") }}
yawol-controller:
enabled: true
yawolFloatingID: "{{ $.InfraCluster.status.externalNetwork.id }}"
yawolNetworkID: "{{ $.InfraCluster.status.network.id }}"
yawolAPIHost: "{{ printf "https://%s:%d" $.Cluster.spec.controlPlaneEndpoint.host $.Cluster.spec.controlPlaneEndpoint.port }}"
yawolFlavorID: {{ template "yawol_flavor_id" $}}
yawolImageID: {{ template "yawol_image_id" $}}
{{- end }}
{{- end }}

openstack-cloud-controller-manager:
cluster:
name: {{ .Cluster.metadata.name }}
cloudConfig:
loadBalancer:
{{- range .Cluster.spec.topology.variables }}
{{- if eq .name "workload_loadbalancer" }}
{{- if or (eq .value "none") (eq .value "yawol") }}
{{- if eq .value "none" }}
enabled: false
{{ else if eq .value "octavia-amphora" }}
enabled: true
Expand Down
15 changes: 6 additions & 9 deletions providers/openstack/scs/cluster-addon/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
dependencies:
- name: metrics-server
repository: https://kubernetes-sigs.github.io/metrics-server/
version: 3.12.0
version: 3.12.2
- name: cilium
repository: https://helm.cilium.io/
version: 1.16.3
version: 1.17.1
- name: openstack-cloud-controller-manager
repository: https://kubernetes.github.io/cloud-provider-openstack
version: 2.28.4
version: 2.30.4
- name: openstack-cinder-csi
repository: https://kubernetes.github.io/cloud-provider-openstack
version: 2.28.2
- name: yawol-controller
repository: https://stackitcloud.github.io/yawol
version: 0.21.3
digest: sha256:022d98ff75f315c6467c2b71156dcf30c25f2437f14c3452ac14c1cd68523b17
generated: "2024-10-20T10:37:24.476007912+02:00"
version: 2.30.2
digest: sha256:0079134a81e34fe1a890745a8438b9e89f382f56a233623519c5d7264d85f645
generated: "2025-03-07T23:35:34.770335187+01:00"
13 changes: 4 additions & 9 deletions providers/openstack/scs/cluster-addon/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,15 @@ dependencies:
- alias: cilium
name: cilium
repository: https://helm.cilium.io/
version: 1.16.3
version: 1.17.1
- alias: openstack-cloud-controller-manager
name: openstack-cloud-controller-manager
repository: https://kubernetes.github.io/cloud-provider-openstack
version: 2.28.4
version: 2.30.4
- alias: openstack-cinder-csi
name: openstack-cinder-csi
repository: https://kubernetes.github.io/cloud-provider-openstack
version: 2.28.2
- alias: yawol-controller
condition: yawol-controller.enabled
name: yawol-controller
repository: https://stackitcloud.github.io/yawol
version: 0.25.0
name: openstack-scs-1-29-cluster-addon
version: 2.30.2
name: openstack-scs-1-30-cluster-addon
type: application
version: v1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
46 changes: 16 additions & 30 deletions providers/openstack/scs/cluster-addon/values.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
metrics-server:
fullnameOverride: metrics-server
replicas: 1
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 0
maxUnavailable: 1

service:
labels:
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "Metrics-server"

defaultArgs:
- --cert-dir=/tmp
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --kubelet-use-node-status-port
- --metric-resolution=15s

args:
- --kubelet-insecure-tls
Expand All @@ -28,11 +11,11 @@ openstack-cloud-controller-manager:
nodeSelector:
node-role.kubernetes.io/control-plane: ""
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
openstack-cinder-csi:
secret:
enabled: true
Expand All @@ -41,17 +24,20 @@ openstack-cinder-csi:
nodeSelector:
node-role.kubernetes.io/control-plane: ""
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
storageClass:
delete:
isDefault: true
yawol-controller:
yawolOSSecretName: cloud-config
enabled: false
cilium:
tls:
secretsNamespace:
name: kube-system
sessionAffinity: true
sctp:
enabled: true
ipam:
mode: "kubernetes"
6 changes: 3 additions & 3 deletions providers/openstack/scs/cluster-class/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
description: "This chart installs and configures:
description: 'This chart installs and configures:

* Openstack scs Cluster Class

"
name: openstack-scs-1-29-cluster-class
'
name: openstack-scs-1-30-cluster-class
type: application
version: v1
Loading