diff --git a/Makefile b/Makefile index 7d77d1ca2..979784735 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,13 @@ dist-docs-generator: build-output-dir dist-functests: ./hack/build-test-bin.sh +.PHONY: new-zversion +new-zversion: dist-clean bump-zversion generate + +.PHONY: bump-zversion +bump-zversion: + ./hack/bump-zversion.sh + .PHONY: build-containers build-containers: bundle-container index-container operator-container must-gather-container diff --git a/deploy/metadata/performance-addon-operator/4.7.1/annotations.yaml b/deploy/metadata/performance-addon-operator/4.7.1/annotations.yaml new file mode 100644 index 000000000..a14a84368 --- /dev/null +++ b/deploy/metadata/performance-addon-operator/4.7.1/annotations.yaml @@ -0,0 +1,7 @@ +annotations: + operators.operatorframework.io.bundle.mediatype.v1: "registry+v1" + operators.operatorframework.io.bundle.manifests.v1: "manifests/" + operators.operatorframework.io.bundle.metadata.v1: "metadata/" + operators.operatorframework.io.bundle.package.v1: "performance-addon-operator" + operators.operatorframework.io.bundle.channels.v1: "4.7" + operators.operatorframework.io.bundle.channel.default.v1: "4.7" diff --git a/deploy/olm-catalog/performance-addon-operator/4.7.1/performance-addon-operator.v4.7.1.clusterserviceversion.yaml b/deploy/olm-catalog/performance-addon-operator/4.7.1/performance-addon-operator.v4.7.1.clusterserviceversion.yaml new file mode 100644 index 000000000..f07d0f0b2 --- /dev/null +++ b/deploy/olm-catalog/performance-addon-operator/4.7.1/performance-addon-operator.v4.7.1.clusterserviceversion.yaml @@ -0,0 +1,269 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + alm-examples: |- + [ + { + "apiVersion": "performance.openshift.io/v1", + "kind": "PerformanceProfile", + "metadata": { + "name": "example-performanceprofile" + }, + "spec": { + "additionalKernelArgs": [ + "nmi_watchdog=0", + "audit=0", + "mce=off", + "processor.max_cstate=1", + "idle=poll", + "intel_idle.max_cstate=0" + ], + "cpu": { + "isolated": "2-3", + "reserved": "0-1" + }, + "hugepages": { + "defaultHugepagesSize": "1G", + "pages": [ + { + "count": 2, + "node": 0, + "size": "1G" + } + ] + }, + "nodeSelector": { + "node-role.kubernetes.io/performance": "" + }, + "realTimeKernel": { + "enabled": true + } + } + }, + { + "apiVersion": "performance.openshift.io/v2", + "kind": "PerformanceProfile", + "metadata": { + "name": "example-performanceprofile" + }, + "spec": { + "additionalKernelArgs": [ + "nmi_watchdog=0", + "audit=0", + "mce=off", + "processor.max_cstate=1", + "idle=poll", + "intel_idle.max_cstate=0" + ], + "cpu": { + "isolated": "2-3", + "reserved": "0-1" + }, + "hugepages": { + "defaultHugepagesSize": "1G", + "pages": [ + { + "count": 2, + "node": 0, + "size": "1G" + } + ] + }, + "nodeSelector": { + "node-role.kubernetes.io/performance": "" + }, + "realTimeKernel": { + "enabled": true + } + } + } + ] + capabilities: Basic Install + containerImage: REPLACE_IMAGE + description: Operator to optimize OpenShift clusters for applications sensitive to CPU and network latency. + olm.skipRange: '>=4.6.0 <4.7.1' + operators.operatorframework.io/builder: operator-sdk-v1.0.0 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 + repository: https://github.com/openshift-kni/performance-addon-operators + name: performance-addon-operator.v4.7.1 + namespace: placeholder +spec: + apiservicedefinitions: {} + customresourcedefinitions: + owned: + - description: PerformanceProfile is the Schema for the performanceprofiles API v2. + displayName: Performance Profile v2 + kind: PerformanceProfile + name: performanceprofiles.performance.openshift.io + version: v2 + - description: PerformanceProfile is the Schema for the performanceprofiles API v1. + displayName: Performance Profile v1 + kind: PerformanceProfile + name: performanceprofiles.performance.openshift.io + version: v1 + - description: PerformanceProfile is the Schema for the performanceprofiles API v1alpha1. + displayName: Performance Profile v1alpha1 + kind: PerformanceProfile + name: performanceprofiles.performance.openshift.io + version: v1alpha1 + description: |2- + + Performance Addon Operator provides the ability to enable advanced node performance tunings on a set of nodes. + displayName: Performance Addon Operator + icon: + - base64data: PHN2ZyBpZD0iZTY5YmZjMDktYTIzMi00YmM5LWEzOGQtZDcwM2Y5MTY4OTE2IiBkYXRhLW5hbWU9Ikljb24iIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDM2IDM2Ij4KICA8ZGVmcz4KICAgIDxzdHlsZT4KICAgICAgLmVjNTIyYmY1LTQ5YWMtNDQ4MS1iN2YwLTdkYmM3NGEyZTg1YiB7CiAgICAgICAgZmlsbDogI2UwMDsKICAgICAgfQogICAgPC9zdHlsZT4KICA8L2RlZnM+CiAgPHBhdGggY2xhc3M9ImVjNTIyYmY1LTQ5YWMtNDQ4MS1iN2YwLTdkYmM3NGEyZTg1YiIgZD0iTTE4LDkuNjJBLjYyLjYyLDAsMSwwLDE3LjM4LDksLjYxLjYxLDAsMCwwLDE4LDkuNjJaIi8+CiAgPGc+CiAgICA8cGF0aCBjbGFzcz0iZWM1MjJiZjUtNDlhYy00NDgxLWI3ZjAtN2RiYzc0YTJlODViIiBkPSJNNiwyNC42MkgzMGEuNjEuNjEsMCwwLDAsLjYyLS42MlY5QS42MS42MSwwLDAsMCwzMCw4LjM4SDIxYS42Mi42MiwwLDEsMCwwLDEuMjRoOC4zOFYyMy4zOEg2LjYyVjkuNjJIMTVhLjYyLjYyLDAsMCwwLDAtMS4yNEg2QS42MS42MSwwLDAsMCw1LjM4LDlWMjRBLjYxLjYxLDAsMCwwLDYsMjQuNjJaIi8+CiAgICA8cGF0aCBjbGFzcz0iZWM1MjJiZjUtNDlhYy00NDgxLWI3ZjAtN2RiYzc0YTJlODViIiBkPSJNMzIsMjYuMzhINGEuNjIuNjIsMCwxLDAsMCwxLjI0SDMyYS42Mi42MiwwLDEsMCwwLTEuMjRaIi8+CiAgICA8cGF0aCBjbGFzcz0iZWM1MjJiZjUtNDlhYy00NDgxLWI3ZjAtN2RiYzc0YTJlODViIiBkPSJNMTUuMTIsMTR2NC4zOEgxMy44OHYtMi41YS42My42MywwLDAsMC0xLjI2LDB2Mi41SDExLjM4VjE3LjEyYS42My42MywwLDAsMC0xLjI2LDB2MS4yNkg5LjVhLjYyLjYyLDAsMCwwLDAsMS4yNEgxN2EuNjIuNjIsMCwwLDAsMC0xLjI0aC0uNjJWMTRhLjYzLjYzLDAsMCwwLTEuMjYsMFoiLz4KICAgIDxwYXRoIGNsYXNzPSJlYzUyMmJmNS00OWFjLTQ0ODEtYjdmMC03ZGJjNzRhMmU4NWIiIGQ9Ik0yMC41LDE3LjEySDIxYTIuNDksMi40OSwwLDAsMCwuMy43M2wtLjMyLjMzYS42Mi42MiwwLDAsMCwuODguODhsLjMzLS4zMmEyLjQ5LDIuNDksMCwwLDAsLjczLjN2LjQ2YS42Mi42MiwwLDAsMCwxLjI0LDBWMTlhMi40OSwyLjQ5LDAsMCwwLC43My0uM2wuMzMuMzJhLjYyLjYyLDAsMCwwLC44OC0uODhsLS4zMi0uMzNhMi40OSwyLjQ5LDAsMCwwLC4zLS43M2guNDZhLjYyLjYyLDAsMCwwLDAtMS4yNEgyNmEyLjQ5LDIuNDksMCwwLDAtLjMtLjczbC4zMi0uMzNjLjU4LS41Ni0uMzItMS40Ni0uODgtLjg4bC0uMzMuMzJhMi40OSwyLjQ5LDAsMCwwLS43My0uM1YxMy41YS42Mi42MiwwLDAsMC0xLjI0LDBWMTRhMi40OSwyLjQ5LDAsMCwwLS43My4zbC0uMzMtLjMyYy0uNTYtLjU4LTEuNDYuMzItLjg4Ljg4bC4zMi4zM2EyLjQ5LDIuNDksMCwwLDAtLjMuNzNIMjAuNUEuNjIuNjIsMCwwLDAsMjAuNSwxNy4xMlptMy0yYTEuMzgsMS4zOCwwLDAsMSwwLDIuNzVBMS4zOCwxLjM4LDAsMCwxLDIzLjUsMTUuMTJaIi8+CiAgPC9nPgo8L3N2Zz4K + mediatype: image/svg+xml + install: + spec: + clusterPermissions: + - rules: + - apiGroups: + - "" + resources: + - events + verbs: + - '*' + - apiGroups: + - machineconfiguration.openshift.io + resources: + - kubeletconfigs + - machineconfigpools + - machineconfigs + verbs: + - '*' + - apiGroups: + - node.k8s.io + resources: + - runtimeclasses + verbs: + - '*' + - apiGroups: + - performance.openshift.io + resources: + - performanceprofiles + - performanceprofiles/finalizers + - performanceprofiles/status + verbs: + - '*' + - apiGroups: + - tuned.openshift.io + resources: + - tuneds + verbs: + - '*' + serviceAccountName: performance-operator + deployments: + - name: performance-operator + spec: + replicas: 1 + selector: + matchLabels: + name: performance-operator + strategy: {} + template: + metadata: + labels: + name: performance-operator + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node-role.kubernetes.io/master + operator: Exists + containers: + - command: + - performance-operator + env: + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.annotations['olm.targetNamespaces'] + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: performance-operator + image: REPLACE_IMAGE + imagePullPolicy: Always + name: performance-operator + resources: {} + serviceAccountName: performance-operator + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + permissions: + - rules: + - apiGroups: + - apps + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - apps + resourceNames: + - performance-operator + resources: + - deployments/finalizers + verbs: + - update + - apiGroups: + - "" + resources: + - configmaps + - pods + - services + - services/finalizers + verbs: + - '*' + - apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - '*' + serviceAccountName: performance-operator + strategy: deployment + installModes: + - supported: false + type: OwnNamespace + - supported: false + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: true + type: AllNamespaces + keywords: + - numa + - realtime + - cpu pinning + - hugepages + links: + - name: Source Code + url: https://github.com/openshift-kni/performance-addon-operators + maturity: alpha + minKubeVersion: 1.19.0 + provider: + name: Red Hat + version: 4.7.1 + webhookdefinitions: + - admissionReviewVersions: + - v1 + - v1alpha1 + containerPort: 443 + conversionCRDs: + - performanceprofiles.performance.openshift.io + deploymentName: performance-operator + generateName: cwb.performance.openshift.io + sideEffects: None + targetPort: 4343 + type: ConversionWebhook + webhookPath: /convert diff --git a/deploy/olm-catalog/performance-addon-operator/4.7.1/performance.openshift.io_performanceprofiles_crd.yaml b/deploy/olm-catalog/performance-addon-operator/4.7.1/performance.openshift.io_performanceprofiles_crd.yaml new file mode 100644 index 000000000..aeb949c47 --- /dev/null +++ b/deploy/olm-catalog/performance-addon-operator/4.7.1/performance.openshift.io_performanceprofiles_crd.yaml @@ -0,0 +1,417 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (devel) + creationTimestamp: null + name: performanceprofiles.performance.openshift.io +spec: + group: performance.openshift.io + names: + kind: PerformanceProfile + listKind: PerformanceProfileList + plural: performanceprofiles + singular: performanceprofile + scope: Cluster + versions: + - name: v1 + schema: + openAPIV3Schema: + description: PerformanceProfile is the Schema for the performanceprofiles API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: PerformanceProfileSpec defines the desired state of PerformanceProfile. + properties: + additionalKernelArgs: + description: Addional kernel arguments. + items: + type: string + type: array + cpu: + description: CPU defines a set of CPU related parameters. + properties: + balanceIsolated: + description: BalanceIsolated toggles whether or not the Isolated CPU set is eligible for load balancing work loads. When this option is set to "false", the Isolated CPU set will be static, meaning workloads have to explicitly assign each thread to a specific cpu in order to work across multiple CPUs. Setting this to "true" allows workloads to be balanced across CPUs. Setting this to "false" offers the most predictable performance for guaranteed workloads, but it offloads the complexity of cpu load balancing to the application. Defaults to "true" + type: boolean + isolated: + description: 'Isolated defines a set of CPUs that will be used to give to application threads the most execution time possible, which means removing as many extraneous tasks off a CPU as possible. It is important to notice the CPU manager can choose any CPU to run the workload except the reserved CPUs. In order to guarantee that your workload will run on the isolated CPU: 1. The union of reserved CPUs and isolated CPUs should include all online CPUs 2. The isolated CPUs field should be the complementary to reserved CPUs field' + type: string + reserved: + description: Reserved defines a set of CPUs that will not be used for any container workloads initiated by kubelet. + type: string + type: object + hugepages: + description: HugePages defines a set of huge pages related parameters. It is possible to set huge pages with multiple size values at the same time. For example, hugepages can be set with 1G and 2M, both values will be set on the node by the performance-addon-operator. It is important to notice that setting hugepages default size to 1G will remove all 2M related folders from the node and it will be impossible to configure 2M hugepages under the node. + properties: + defaultHugepagesSize: + description: DefaultHugePagesSize defines huge pages default size under kernel boot parameters. + type: string + pages: + description: Pages defines huge pages that we want to allocate at boot time. + items: + description: HugePage defines the number of allocated huge pages of the specific size. + properties: + count: + description: Count defines amount of huge pages, maps to the 'hugepages' kernel boot parameter. + format: int32 + type: integer + node: + description: Node defines the NUMA node where hugepages will be allocated, if not specified, pages will be allocated equally between NUMA nodes + format: int32 + type: integer + size: + description: Size defines huge page size, maps to the 'hugepagesz' kernel boot parameter. + type: string + type: object + type: array + type: object + machineConfigLabel: + additionalProperties: + type: string + description: MachineConfigLabel defines the label to add to the MachineConfigs the operator creates. It has to be used in the MachineConfigSelector of the MachineConfigPool which targets this performance profile. Defaults to "machineconfiguration.openshift.io/role=" + type: object + machineConfigPoolSelector: + additionalProperties: + type: string + description: MachineConfigPoolSelector defines the MachineConfigPool label to use in the MachineConfigPoolSelector of resources like KubeletConfigs created by the operator. Defaults to "machineconfiguration.openshift.io/role=" + type: object + nodeSelector: + additionalProperties: + type: string + description: NodeSelector defines the Node label to use in the NodeSelectors of resources like Tuned created by the operator. It most likely should, but does not have to match the node label in the NodeSelector of the MachineConfigPool which targets this performance profile. + type: object + numa: + description: NUMA defines options related to topology aware affinities + properties: + topologyPolicy: + description: Name of the policy applied when TopologyManager is enabled Operator defaults to "best-effort" + type: string + type: object + realTimeKernel: + description: RealTimeKernel defines a set of real time kernel related parameters. RT kernel won't be installed when not set. + properties: + enabled: + description: Enabled defines if the real time kernel packages should be installed. Defaults to "false" + type: boolean + type: object + type: object + status: + description: PerformanceProfileStatus defines the observed state of PerformanceProfile. + properties: + conditions: + description: Conditions represents the latest available observations of current state. + items: + description: Condition represents the state of the operator's reconciliation functionality. + properties: + lastHeartbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + reason: + type: string + status: + type: string + type: + description: ConditionType is the state of the operator's reconciliation functionality. + type: string + required: + - status + - type + type: object + type: array + runtimeClass: + description: RuntimeClass contains the name of the RuntimeClass resource created by the operator. + type: string + tuned: + description: Tuned points to the Tuned custom resource object that contains the tuning values generated by this operator. + type: string + type: object + type: object + served: true + storage: false + subresources: + status: {} + - name: v1alpha1 + schema: + openAPIV3Schema: + description: PerformanceProfile is the Schema for the performanceprofiles API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: PerformanceProfileSpec defines the desired state of PerformanceProfile. + properties: + additionalKernelArgs: + description: Addional kernel arguments. + items: + type: string + type: array + cpu: + description: CPU defines a set of CPU related parameters. + properties: + balanceIsolated: + description: BalanceIsolated toggles whether or not the Isolated CPU set is eligible for load balancing work loads. When this option is set to "false", the Isolated CPU set will be static, meaning workloads have to explicitly assign each thread to a specific cpu in order to work across multiple CPUs. Setting this to "true" allows workloads to be balanced across CPUs. Setting this to "false" offers the most predictable performance for guaranteed workloads, but it offloads the complexity of cpu load balancing to the application. Defaults to "true" + type: boolean + isolated: + description: 'Isolated defines a set of CPUs that will be used to give to application threads the most execution time possible, which means removing as many extraneous tasks off a CPU as possible. It is important to notice the CPU manager can choose any CPU to run the workload except the reserved CPUs. In order to guarantee that your workload will run on the isolated CPU: 1. The union of reserved CPUs and isolated CPUs should include all online CPUs 2. The isolated CPUs field should be the complementary to reserved CPUs field' + type: string + reserved: + description: Reserved defines a set of CPUs that will not be used for any container workloads initiated by kubelet. + type: string + type: object + hugepages: + description: HugePages defines a set of huge pages related parameters. It is possible to set huge pages with multiple size values at the same time. For example, hugepages can be set with 1G and 2M, both values will be set on the node by the performance-addon-operator. It is important to notice that setting hugepages default size to 1G will remove all 2M related folders from the node and it will be impossible to configure 2M hugepages under the node. + properties: + defaultHugepagesSize: + description: DefaultHugePagesSize defines huge pages default size under kernel boot parameters. + type: string + pages: + description: Pages defines huge pages that we want to allocate at boot time. + items: + description: HugePage defines the number of allocated huge pages of the specific size. + properties: + count: + description: Count defines amount of huge pages, maps to the 'hugepages' kernel boot parameter. + format: int32 + type: integer + node: + description: Node defines the NUMA node where hugepages will be allocated, if not specified, pages will be allocated equally between NUMA nodes + format: int32 + type: integer + size: + description: Size defines huge page size, maps to the 'hugepagesz' kernel boot parameter. + type: string + type: object + type: array + type: object + machineConfigLabel: + additionalProperties: + type: string + description: MachineConfigLabel defines the label to add to the MachineConfigs the operator creates. It has to be used in the MachineConfigSelector of the MachineConfigPool which targets this performance profile. Defaults to "machineconfiguration.openshift.io/role=" + type: object + machineConfigPoolSelector: + additionalProperties: + type: string + description: MachineConfigPoolSelector defines the MachineConfigPool label to use in the MachineConfigPoolSelector of resources like KubeletConfigs created by the operator. Defaults to "machineconfiguration.openshift.io/role=" + type: object + nodeSelector: + additionalProperties: + type: string + description: NodeSelector defines the Node label to use in the NodeSelectors of resources like Tuned created by the operator. It most likely should, but does not have to match the node label in the NodeSelector of the MachineConfigPool which targets this performance profile. + type: object + numa: + description: NUMA defines options related to topology aware affinities + properties: + topologyPolicy: + description: Name of the policy applied when TopologyManager is enabled Operator defaults to "best-effort" + type: string + type: object + realTimeKernel: + description: RealTimeKernel defines a set of real time kernel related parameters. RT kernel won't be installed when not set. + properties: + enabled: + description: Enabled defines if the real time kernel packages should be installed. Defaults to "false" + type: boolean + type: object + type: object + status: + description: PerformanceProfileStatus defines the observed state of PerformanceProfile. + properties: + conditions: + description: Conditions represents the latest available observations of current state. + items: + description: Condition represents the state of the operator's reconciliation functionality. + properties: + lastHeartbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + reason: + type: string + status: + type: string + type: + description: ConditionType is the state of the operator's reconciliation functionality. + type: string + required: + - status + - type + type: object + type: array + runtimeClass: + description: RuntimeClass contains the name of the RuntimeClass resource created by the operator. + type: string + tuned: + description: Tuned points to the Tuned custom resource object that contains the tuning values generated by this operator. + type: string + type: object + type: object + served: true + storage: false + subresources: + status: {} + - name: v2 + schema: + openAPIV3Schema: + description: PerformanceProfile is the Schema for the performanceprofiles API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: PerformanceProfileSpec defines the desired state of PerformanceProfile. + properties: + additionalKernelArgs: + description: Addional kernel arguments. + items: + type: string + type: array + cpu: + description: CPU defines a set of CPU related parameters. + properties: + balanceIsolated: + description: BalanceIsolated toggles whether or not the Isolated CPU set is eligible for load balancing work loads. When this option is set to "false", the Isolated CPU set will be static, meaning workloads have to explicitly assign each thread to a specific cpu in order to work across multiple CPUs. Setting this to "true" allows workloads to be balanced across CPUs. Setting this to "false" offers the most predictable performance for guaranteed workloads, but it offloads the complexity of cpu load balancing to the application. Defaults to "true" + type: boolean + isolated: + description: 'Isolated defines a set of CPUs that will be used to give to application threads the most execution time possible, which means removing as many extraneous tasks off a CPU as possible. It is important to notice the CPU manager can choose any CPU to run the workload except the reserved CPUs. In order to guarantee that your workload will run on the isolated CPU: 1. The union of reserved CPUs and isolated CPUs should include all online CPUs 2. The isolated CPUs field should be the complementary to reserved CPUs field' + type: string + reserved: + description: Reserved defines a set of CPUs that will not be used for any container workloads initiated by kubelet. + type: string + required: + - isolated + type: object + globallyDisableIrqLoadBalancing: + description: GloballyDisableIrqLoadBalancing toggles whether IRQ load balancing will be disabled for the Isolated CPU set. When the option is set to "true" it disables IRQs load balancing for the Isolated CPU set. Setting the option to "false" allows the IRQs to be balanced across all CPUs, however the IRQs load balancing can be disabled per pod CPUs when using irq-load-balancing.crio.io/cpu-quota.crio.io annotations. Defaults to "false" + type: boolean + hugepages: + description: HugePages defines a set of huge pages related parameters. It is possible to set huge pages with multiple size values at the same time. For example, hugepages can be set with 1G and 2M, both values will be set on the node by the performance-addon-operator. It is important to notice that setting hugepages default size to 1G will remove all 2M related folders from the node and it will be impossible to configure 2M hugepages under the node. + properties: + defaultHugepagesSize: + description: DefaultHugePagesSize defines huge pages default size under kernel boot parameters. + type: string + pages: + description: Pages defines huge pages that we want to allocate at boot time. + items: + description: HugePage defines the number of allocated huge pages of the specific size. + properties: + count: + description: Count defines amount of huge pages, maps to the 'hugepages' kernel boot parameter. + format: int32 + type: integer + node: + description: Node defines the NUMA node where hugepages will be allocated, if not specified, pages will be allocated equally between NUMA nodes + format: int32 + type: integer + size: + description: Size defines huge page size, maps to the 'hugepagesz' kernel boot parameter. + type: string + type: object + type: array + type: object + machineConfigLabel: + additionalProperties: + type: string + description: MachineConfigLabel defines the label to add to the MachineConfigs the operator creates. It has to be used in the MachineConfigSelector of the MachineConfigPool which targets this performance profile. Defaults to "machineconfiguration.openshift.io/role=" + type: object + machineConfigPoolSelector: + additionalProperties: + type: string + description: MachineConfigPoolSelector defines the MachineConfigPool label to use in the MachineConfigPoolSelector of resources like KubeletConfigs created by the operator. Defaults to "machineconfiguration.openshift.io/role=" + type: object + nodeSelector: + additionalProperties: + type: string + description: NodeSelector defines the Node label to use in the NodeSelectors of resources like Tuned created by the operator. It most likely should, but does not have to match the node label in the NodeSelector of the MachineConfigPool which targets this performance profile. + type: object + numa: + description: NUMA defines options related to topology aware affinities + properties: + topologyPolicy: + description: Name of the policy applied when TopologyManager is enabled Operator defaults to "best-effort" + type: string + type: object + realTimeKernel: + description: RealTimeKernel defines a set of real time kernel related parameters. RT kernel won't be installed when not set. + properties: + enabled: + description: Enabled defines if the real time kernel packages should be installed. Defaults to "false" + type: boolean + type: object + required: + - cpu + - nodeSelector + type: object + status: + description: PerformanceProfileStatus defines the observed state of PerformanceProfile. + properties: + conditions: + description: Conditions represents the latest available observations of current state. + items: + description: Condition represents the state of the operator's reconciliation functionality. + properties: + lastHeartbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + reason: + type: string + status: + type: string + type: + description: ConditionType is the state of the operator's reconciliation functionality. + type: string + required: + - status + - type + type: object + type: array + runtimeClass: + description: RuntimeClass contains the name of the RuntimeClass resource created by the operator. + type: string + tuned: + description: Tuned points to the Tuned custom resource object that contains the tuning values generated by this operator. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/hack/bump-zversion.sh b/hack/bump-zversion.sh new file mode 100755 index 000000000..ce43bec29 --- /dev/null +++ b/hack/bump-zversion.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +set -e + +BASEDIR="$(dirname $0 )" + +# shellcheck source=common.sh +source "$(dirname $0)/common.sh" + +CSV_VERSION_A=( ${CSV_VERSION//./ } ) # replace points, split into array +ZVERSION_NOW="${CSV_VERSION_A[2]}" +ZVERSION_NEXT=$( expr ${ZVERSION_NOW} + 1) +CSV_VERSION_NEXT="${CSV_VERSION_A[0]}.${CSV_VERSION_A[1]}.${ZVERSION_NEXT}" + +echo "${CSV_VERSION} -> ${CSV_VERSION_NEXT}" + +# channel format MUST be "${MAJOR}.${MINOR}" so we can ignore the zversion bump and we can just copy the file. +mkdir -p "${BASEDIR}/../deploy/metadata/performance-addon-operator/${CSV_VERSION_NEXT}" +cp -a \ + "${BASEDIR}/../deploy/metadata/performance-addon-operator/${CSV_VERSION}/annotations.yaml" \ + "${BASEDIR}/../deploy/metadata/performance-addon-operator/${CSV_VERSION_NEXT}/annotations.yaml" + +mkdir -p "${BASEDIR}/../deploy/olm-catalog/performance-addon-operator/${CSV_VERSION_NEXT}" +cp -a \ + "${BASEDIR}/../deploy/olm-catalog/performance-addon-operator/${CSV_VERSION}/performance.openshift.io_performanceprofiles_crd.yaml" \ + "${BASEDIR}/../deploy/olm-catalog/performance-addon-operator/${CSV_VERSION_NEXT}/performance.openshift.io_performanceprofiles_crd.yaml" +sed "s/${CSV_VERSION}/${CSV_VERSION_NEXT}/" \ + < "${BASEDIR}/../deploy/olm-catalog/performance-addon-operator/${CSV_VERSION}/performance-addon-operator.v${CSV_VERSION}.clusterserviceversion.yaml" \ + > "${BASEDIR}/../deploy/olm-catalog/performance-addon-operator/${CSV_VERSION_NEXT}/performance-addon-operator.v${CSV_VERSION_NEXT}.clusterserviceversion.yaml" + +BUNDLE_CI_TMP=$(mktemp) +sed "s/ZVERSION=${ZVERSION_NOW}/ZVERSION=${ZVERSION_NEXT}/" \ + < "${BASEDIR}/../openshift-ci/Dockerfile.bundle.ci" \ + > "${BUNDLE_CI_TMP}" \ +&& \ +mv "${BUNDLE_CI_TMP}" "${BASEDIR}/../openshift-ci/Dockerfile.bundle.ci" + +BUNDLE_UPSTREAM_DEV_TMP=$(mktemp) +sed "s/ZVERSION=${ZVERSION_NOW}/ZVERSION=${ZVERSION_NEXT}/" \ + < "${BASEDIR}/../openshift-ci/Dockerfile.bundle.upstream.dev" \ + > "${BUNDLE_UPSTREAM_DEV_TMP}" \ +&& \ +mv "${BUNDLE_UPSTREAM_DEV_TMP}" "${BASEDIR}/../openshift-ci/Dockerfile.bundle.upstream.dev" + +# leave this for last +COMMON_TMP=$(mktemp) +sed "s/${CSV_VERSION}/${CSV_VERSION_NEXT}/" \ + < "${BASEDIR}/common.sh" \ + > "${COMMON_TMP}" \ +&& \ +mv "${COMMON_TMP}" "${BASEDIR}/common.sh" diff --git a/hack/common.sh b/hack/common.sh index 9b35e314d..ec2fe92d4 100644 --- a/hack/common.sh +++ b/hack/common.sh @@ -11,7 +11,7 @@ METADATA_DIR="${REPO_DIR}/deploy/metadata/performance-addon-operator" IMAGE_BUILD_CMD=${IMAGE_BUILD_CMD:-podman} -CSV_VERSION=${CSV_VERSION:-"4.7.0"} +CSV_VERSION=${CSV_VERSION:-"4.7.1"} PREV_CSV_VERSION=${PREV_CSV_VERSION:-"4.6.0"} CSV_CHANNEL=${CSV_CHANNEL:-"4.7"} diff --git a/openshift-ci/Dockerfile.bundle.ci b/openshift-ci/Dockerfile.bundle.ci index 72fd9efed..9e5ca382b 100644 --- a/openshift-ci/Dockerfile.bundle.ci +++ b/openshift-ci/Dockerfile.bundle.ci @@ -2,7 +2,7 @@ FROM scratch ARG CHANNEL=4.7 -ARG ZVERSION=0 +ARG ZVERSION=1 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ diff --git a/openshift-ci/Dockerfile.bundle.upstream.dev b/openshift-ci/Dockerfile.bundle.upstream.dev index c290f8efd..06855406f 100644 --- a/openshift-ci/Dockerfile.bundle.upstream.dev +++ b/openshift-ci/Dockerfile.bundle.upstream.dev @@ -2,7 +2,7 @@ FROM scratch ARG CHANNEL=4.7 -ARG ZVERSION=0 +ARG ZVERSION=1 ARG OLM_SOURCE=build/_output/manifests LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1