diff --git a/bindata/cloud-network-config-controller/managed/controller.yaml b/bindata/cloud-network-config-controller/managed/controller.yaml index f2d8ad28ab..727fe9ae95 100644 --- a/bindata/cloud-network-config-controller/managed/controller.yaml +++ b/bindata/cloud-network-config-controller/managed/controller.yaml @@ -66,7 +66,7 @@ spec: matchLabels: hypershift.openshift.io/hosted-control-plane: {{.HostedClusterNamespace}} topologyKey: kubernetes.io/hostname - priorityClassName: hypershift-control-plane + priorityClassName: {{ .PriorityClass | default "hypershift-control-plane" }} securityContext: {{- if not (eq .RunAsUser "")}} runAsUser: {{.RunAsUser}} diff --git a/bindata/network/node-identity/managed/node-identity.yaml b/bindata/network/node-identity/managed/node-identity.yaml index 6abf0ea656..8031580909 100644 --- a/bindata/network/node-identity/managed/node-identity.yaml +++ b/bindata/network/node-identity/managed/node-identity.yaml @@ -79,7 +79,7 @@ spec: matchLabels: hypershift.openshift.io/hosted-control-plane: {{.HostedClusterNamespace}} topologyKey: kubernetes.io/hostname - priorityClassName: hypershift-api-critical + priorityClassName: {{ .PriorityClass | default "hypershift-api-critical" }} initContainers: - name: hosted-cluster-kubecfg-setup image: "{{.CLIImage}}" diff --git a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml index a9173210fb..0f6887a738 100644 --- a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml +++ b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml @@ -81,7 +81,7 @@ spec: matchLabels: hypershift.openshift.io/hosted-control-plane: {{.HostedClusterNamespace}} topologyKey: kubernetes.io/hostname - priorityClassName: hypershift-api-critical + priorityClassName: {{ .PriorityClass | default "hypershift-api-critical" }} initContainers: # Remove once https://github.com/kubernetes/kubernetes/issues/85966 is addressed - name: init-ip diff --git a/pkg/bootstrap/types.go b/pkg/bootstrap/types.go index 8ed4331330..53fe016833 100644 --- a/pkg/bootstrap/types.go +++ b/pkg/bootstrap/types.go @@ -20,6 +20,7 @@ type OVNHyperShiftBootstrapResult struct { ControlPlaneImage string CAConfigMap string CAConfigMapKey string + PriorityClass string } type OVNConfigBoostrapResult struct { diff --git a/pkg/network/cloud_network.go b/pkg/network/cloud_network.go index 3a756e9fb9..5f77204df8 100644 --- a/pkg/network/cloud_network.go +++ b/pkg/network/cloud_network.go @@ -98,6 +98,7 @@ func renderCloudNetworkConfigController(conf *operv1.NetworkSpec, bootstrapResul data.Data["HCPLabels"] = cloudBootstrapResult.HostedControlPlane.Labels data.Data["HCPTolerations"] = cloudBootstrapResult.HostedControlPlane.Tolerations data.Data["RunAsUser"] = hcpCfg.RunAsUser + data.Data["PriorityClass"] = cloudBootstrapResult.HostedControlPlane.PriorityClass // In HyperShift CloudNetworkConfigController is deployed as a part of the hosted cluster controlplane // which means that it is created in the management cluster. // CloudNetworkConfigController should use the proxy settings configured by hypershift controlplane operator diff --git a/pkg/network/node_identity.go b/pkg/network/node_identity.go index 7799515739..6a8abea1b9 100644 --- a/pkg/network/node_identity.go +++ b/pkg/network/node_identity.go @@ -102,6 +102,7 @@ func renderNetworkNodeIdentity(conf *operv1.NetworkSpec, bootstrapResult *bootst data.Data["HCPNodeSelector"] = bootstrapResult.Infra.HostedControlPlane.NodeSelector data.Data["HCPLabels"] = bootstrapResult.Infra.HostedControlPlane.Labels data.Data["HCPTolerations"] = bootstrapResult.Infra.HostedControlPlane.Tolerations + data.Data["PriorityClass"] = bootstrapResult.Infra.HostedControlPlane.PriorityClass data.Data["NetworkNodeIdentityImage"] = hcpCfg.ControlPlaneImage // OVN_CONTROL_PLANE_IMAGE localAPIServer := bootstrapResult.Infra.APIServers[bootstrap.APIServerDefaultLocal] diff --git a/pkg/network/ovn_kubernetes.go b/pkg/network/ovn_kubernetes.go index b8640eb4bd..5865f6c8ad 100644 --- a/pkg/network/ovn_kubernetes.go +++ b/pkg/network/ovn_kubernetes.go @@ -234,6 +234,10 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo data.Data["HCPNodeSelector"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.HCPNodeSelector data.Data["HCPLabels"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.HCPLabels data.Data["HCPTolerations"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.HCPTolerations + data.Data["CAConfigMap"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.CAConfigMap + data.Data["CAConfigMapKey"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.CAConfigMapKey + data.Data["RunAsUser"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.RunAsUser + data.Data["PriorityClass"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.PriorityClass data.Data["OVN_NB_INACTIVITY_PROBE"] = nb_inactivity_probe data.Data["OVN_CERT_CN"] = OVN_CERT_CN data.Data["OVN_NORTHD_PROBE_INTERVAL"] = os.Getenv("OVN_NORTHD_PROBE_INTERVAL") @@ -418,9 +422,6 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo productFlavor := "self-hosted" if bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.Enabled { productFlavor = "managed" - data.Data["CAConfigMap"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.CAConfigMap - data.Data["CAConfigMapKey"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.CAConfigMapKey - data.Data["RunAsUser"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.RunAsUser } manifestSubDir := filepath.Join(manifestDir, "network/ovn-kubernetes", productFlavor) manifestDirs = append(manifestDirs, manifestSubDir) @@ -734,6 +735,7 @@ func bootstrapOVNHyperShiftConfig(hc *hypershift.HyperShiftConfig, kubeClient cn ovnHypershiftResult.HCPNodeSelector = hcp.NodeSelector ovnHypershiftResult.HCPLabels = hcp.Labels ovnHypershiftResult.HCPTolerations = hcp.Tolerations + ovnHypershiftResult.PriorityClass = hcp.PriorityClass switch hcp.ControllerAvailabilityPolicy { case hypershift.HighlyAvailable: