diff --git a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml index 65303ef..342a4c6 100644 --- a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml +++ b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml @@ -356,7 +356,7 @@ cre ate group names like oidc:engineering and oidc:infra." matchResources: infrastructureCluster: true jsonPatches: - - op: add + - op: replace path: "/spec/template/spec/apiServerLoadBalancer/enabled" value: true - op: add @@ -372,7 +372,7 @@ cre ate group names like oidc:engineering and oidc:infra." matchResources: infrastructureCluster: true jsonPatches: - - op: add + - op: replace path: "/spec/template/spec/apiServerLoadBalancer/enabled" value: true - op: add @@ -812,7 +812,7 @@ cre ate group names like oidc:engineering and oidc:infra." matchResources: infrastructureCluster: true jsonPatches: - - op: replace + - op: add path: "/spec/template/spec/managedSubnets" valueFrom: template: | diff --git a/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml b/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml index cb9b3e6..ce689a2 100644 --- a/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml +++ b/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml @@ -45,9 +45,3 @@ spec: portRangeMax: 4244 protocol: tcp description: "Allow Hubble traffic for Cilium" - managedSubnets: - - cidr: {{ .Values.node_cidr }} - dnsNameservers: - {{- range .Values.dns_nameservers }} - - {{ . }} - {{- end }} diff --git a/providers/openstack/scs/cluster-class/values.yaml b/providers/openstack/scs/cluster-class/values.yaml index 530ae15..d1650e6 100644 --- a/providers/openstack/scs/cluster-class/values.yaml +++ b/providers/openstack/scs/cluster-class/values.yaml @@ -1,14 +1,10 @@ # mirrored from variables.tf -dns_nameservers: - - 5.1.66.255 - - 185.150.99.255 controller_flavor: SCS-2V-4-20 worker_flavor: SCS-2V-4-20 -node_cidr: 10.8.0.0/20 restrict_kubeapi: [] # newly introduced: -openstack_loadbalancer_apiserver: true +openstack_loadbalancer_apiserver: false # TBD, currently needed: images: