Skip to content

Commit

Permalink
Merge branch 'main' into feat/checkout-pr-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
chess-knight authored Jul 30, 2024
2 parents e578e4e + 287ec47 commit 400ecd8
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 5 deletions.
10 changes: 5 additions & 5 deletions providers/openstack/scs/cluster-addon/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ dependencies:
version: 3.12.0
- name: cilium
repository: https://helm.cilium.io/
version: 1.15.2
version: 1.15.6
- name: openstack-cloud-controller-manager
repository: https://kubernetes.github.io/cloud-provider-openstack
version: 2.27.6
version: 2.28.4
- name: openstack-cinder-csi
repository: https://kubernetes.github.io/cloud-provider-openstack
version: 2.27.3
version: 2.28.2
- name: yawol-controller
repository: https://stackitcloud.github.io/yawol
version: 0.21.3
digest: sha256:a9577a7d1414721ba6325511747f67dbb82f04d2b84134d92531ce2a69894a41
generated: "2024-03-27T12:49:53.970259991+01:00"
digest: sha256:2bb6cede9f83f24f25f30faa9cdb3adf6e0d12df24ae200928f1f638a2e56003
generated: "2024-07-24T11:41:32.829792991+02:00"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
21 changes: 21 additions & 0 deletions providers/openstack/scs/cluster-class/templates/cluster-class.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,13 @@ Iss uer URL )# where ( Issuer URL ) is the value of --oidc-issuer-url. The value
description: "Prefix prepended to group claims to prevent clashes
wit h existing names (such as system: groups). For example, the value oidc: will
cre ate group names like oidc:engineering and oidc:infra."
- name: network_mtu
required: false
schema:
openAPIV3Schema:
type: integer
example: 1500
description: "NetworkMTU sets the maximum transmission unit (MTU) value to address fragmentation for the private network ID."
patches:
- name: k8s_version
description: "Sets the openstack node image for workers and the controlplane to the cluster-api image with the version mentioned in spec.topology.version."
Expand Down Expand Up @@ -567,6 +574,20 @@ cre ate group names like oidc:engineering and oidc:infra."
path: "/spec/template/spec/externalNetwork/id"
valueFrom:
variable: external_id
- name: network_mtu
description: "Sets the network MTU when variable network_mtu exist in cluster resource."
enabledIf: {{ `"{{ if .network_mtu }}true{{end}}"` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: OpenStackClusterTemplate
matchResources:
infrastructureCluster: true
jsonPatches:
- op: add
path: "/spec/template/spec/networkMTU"
valueFrom:
variable: network_mtu
- name: openstack_security_groups
description: "Sets the list of the openstack security groups for the worker and the controlplane instances."
enabledIf: {{ `"{{ if .openstack_security_groups }}true{{end}}"` }}
Expand Down

0 comments on commit 400ecd8

Please sign in to comment.