Skip to content

Commit 215faf3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #547 from yanirq/z_stream_4_6_2
[release 4.6] Add bump tool and bump version to 4.6.2
2 parents 30eddb9 + 6171c0d commit 215faf3

File tree

7 files changed

+653
-2
lines changed

7 files changed

+653
-2
lines changed

‎Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ BUILD_DATE=$$(date --utc -Iseconds)
3737
# Export GO111MODULE=on to enable project to be built from within GOPATH/src
3838
export GO111MODULE=on
3939

40+
.PHONY: new-zversion
41+
new-zversion: dist-clean bump-zversion generate
42+
43+
.PHONY: bump-zversion
44+
bump-zversion:
45+
./hack/bump-zversion.sh
46+
4047
.PHONY: build
4148
build: gofmt golint govet dist generate-manifests-tree
4249

‎deploy/metadata/performance-addon-operator/4.6.2/annotations.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
annotations:
2+
operators.operatorframework.io.bundle.mediatype.v1: "registry+v1"
3+
operators.operatorframework.io.bundle.manifests.v1: "manifests/"
4+
operators.operatorframework.io.bundle.metadata.v1: "metadata/"
5+
operators.operatorframework.io.bundle.package.v1: "performance-addon-operator"
6+
operators.operatorframework.io.bundle.channels.v1: "4.6"
7+
operators.operatorframework.io.bundle.channel.default.v1: "4.6"

‎deploy/olm-catalog/performance-addon-operator/4.6.2/performance-addon-operator.v4.6.2.clusterserviceversion.yaml‎

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
---
2+
apiVersion: operators.coreos.com/v1alpha1
3+
kind: ClusterServiceVersion
4+
metadata:
5+
annotations:
6+
alm-examples: |-
7+
[
8+
{
9+
"apiVersion": "performance.openshift.io/v1",
10+
"kind": "PerformanceProfile",
11+
"metadata": {
12+
"name": "example-performanceprofile"
13+
},
14+
"spec": {
15+
"additionalKernelArgs": [
16+
"nmi_watchdog=0",
17+
"audit=0",
18+
"mce=off",
19+
"processor.max_cstate=1",
20+
"idle=poll",
21+
"intel_idle.max_cstate=0"
22+
],
23+
"cpu": {
24+
"isolated": "2-3",
25+
"reserved": "0-1"
26+
},
27+
"hugepages": {
28+
"defaultHugepagesSize": "1G",
29+
"pages": [
30+
{
31+
"count": 2,
32+
"node": 0,
33+
"size": "1G"
34+
}
35+
]
36+
},
37+
"nodeSelector": {
38+
"node-role.kubernetes.io/performance": ""
39+
},
40+
"realTimeKernel": {
41+
"enabled": true
42+
}
43+
}
44+
}
45+
]
46+
capabilities: Basic Install
47+
containerImage: REPLACE_IMAGE
48+
olm.skipRange: '>=4.5.0 <4.6.2'
49+
name: performance-addon-operator.v4.6.2
50+
namespace: placeholder
51+
spec:
52+
apiservicedefinitions: {}
53+
customresourcedefinitions:
54+
owned:
55+
- description: PerformanceProfile is the Schema for the performanceprofiles API.
56+
displayName: Performance Profile
57+
kind: PerformanceProfile
58+
name: performanceprofiles.performance.openshift.io
59+
version: v1
60+
- description: PerformanceProfile is the Schema for the performanceprofiles API.
61+
displayName: Performance Profile
62+
kind: PerformanceProfile
63+
name: performanceprofiles.performance.openshift.io
64+
version: v1alpha1
65+
description: |2-
66+
67+
Performance Addon Operator provides the ability to enable advanced node performance tunings on a set of nodes.
68+
displayName: Performance Addon Operator
69+
icon:
70+
- base64data: PHN2ZyBpZD0iZTY5YmZjMDktYTIzMi00YmM5LWEzOGQtZDcwM2Y5MTY4OTE2IiBkYXRhLW5hbWU9Ikljb24iIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDM2IDM2Ij4KICA8ZGVmcz4KICAgIDxzdHlsZT4KICAgICAgLmVjNTIyYmY1LTQ5YWMtNDQ4MS1iN2YwLTdkYmM3NGEyZTg1YiB7CiAgICAgICAgZmlsbDogI2UwMDsKICAgICAgfQogICAgPC9zdHlsZT4KICA8L2RlZnM+CiAgPHBhdGggY2xhc3M9ImVjNTIyYmY1LTQ5YWMtNDQ4MS1iN2YwLTdkYmM3NGEyZTg1YiIgZD0iTTE4LDkuNjJBLjYyLjYyLDAsMSwwLDE3LjM4LDksLjYxLjYxLDAsMCwwLDE4LDkuNjJaIi8+CiAgPGc+CiAgICA8cGF0aCBjbGFzcz0iZWM1MjJiZjUtNDlhYy00NDgxLWI3ZjAtN2RiYzc0YTJlODViIiBkPSJNNiwyNC42MkgzMGEuNjEuNjEsMCwwLDAsLjYyLS42MlY5QS42MS42MSwwLDAsMCwzMCw4LjM4SDIxYS42Mi42MiwwLDEsMCwwLDEuMjRoOC4zOFYyMy4zOEg2LjYyVjkuNjJIMTVhLjYyLjYyLDAsMCwwLDAtMS4yNEg2QS42MS42MSwwLDAsMCw1LjM4LDlWMjRBLjYxLjYxLDAsMCwwLDYsMjQuNjJaIi8+CiAgICA8cGF0aCBjbGFzcz0iZWM1MjJiZjUtNDlhYy00NDgxLWI3ZjAtN2RiYzc0YTJlODViIiBkPSJNMzIsMjYuMzhINGEuNjIuNjIsMCwxLDAsMCwxLjI0SDMyYS42Mi42MiwwLDEsMCwwLTEuMjRaIi8+CiAgICA8cGF0aCBjbGFzcz0iZWM1MjJiZjUtNDlhYy00NDgxLWI3ZjAtN2RiYzc0YTJlODViIiBkPSJNMTUuMTIsMTR2NC4zOEgxMy44OHYtMi41YS42My42MywwLDAsMC0xLjI2LDB2Mi41SDExLjM4VjE3LjEyYS42My42MywwLDAsMC0xLjI2LDB2MS4yNkg5LjVhLjYyLjYyLDAsMCwwLDAsMS4yNEgxN2EuNjIuNjIsMCwwLDAsMC0xLjI0aC0uNjJWMTRhLjYzLjYzLDAsMCwwLTEuMjYsMFoiLz4KICAgIDxwYXRoIGNsYXNzPSJlYzUyMmJmNS00OWFjLTQ0ODEtYjdmMC03ZGJjNzRhMmU4NWIiIGQ9Ik0yMC41LDE3LjEySDIxYTIuNDksMi40OSwwLDAsMCwuMy43M2wtLjMyLjMzYS42Mi42MiwwLDAsMCwuODguODhsLjMzLS4zMmEyLjQ5LDIuNDksMCwwLDAsLjczLjN2LjQ2YS42Mi42MiwwLDAsMCwxLjI0LDBWMTlhMi40OSwyLjQ5LDAsMCwwLC43My0uM2wuMzMuMzJhLjYyLjYyLDAsMCwwLC44OC0uODhsLS4zMi0uMzNhMi40OSwyLjQ5LDAsMCwwLC4zLS43M2guNDZhLjYyLjYyLDAsMCwwLDAtMS4yNEgyNmEyLjQ5LDIuNDksMCwwLDAtLjMtLjczbC4zMi0uMzNjLjU4LS41Ni0uMzItMS40Ni0uODgtLjg4bC0uMzMuMzJhMi40OSwyLjQ5LDAsMCwwLS43My0uM1YxMy41YS42Mi42MiwwLDAsMC0xLjI0LDBWMTRhMi40OSwyLjQ5LDAsMCwwLS43My4zbC0uMzMtLjMyYy0uNTYtLjU4LTEuNDYuMzItLjg4Ljg4bC4zMi4zM2EyLjQ5LDIuNDksMCwwLDAtLjMuNzNIMjAuNUEuNjIuNjIsMCwwLDAsMjAuNSwxNy4xMlptMy0yYTEuMzgsMS4zOCwwLDAsMSwwLDIuNzVBMS4zOCwxLjM4LDAsMCwxLDIzLjUsMTUuMTJaIi8+CiAgPC9nPgo8L3N2Zz4K
71+
mediatype: image/svg+xml
72+
install:
73+
spec:
74+
clusterPermissions:
75+
- rules:
76+
- apiGroups:
77+
- ""
78+
resources:
79+
- events
80+
verbs:
81+
- '*'
82+
- apiGroups:
83+
- performance.openshift.io
84+
resources:
85+
- performanceprofiles
86+
- performanceprofiles/finalizers
87+
- performanceprofiles/status
88+
verbs:
89+
- '*'
90+
- apiGroups:
91+
- machineconfiguration.openshift.io
92+
resources:
93+
- machineconfigs
94+
- machineconfigpools
95+
- kubeletconfigs
96+
verbs:
97+
- '*'
98+
- apiGroups:
99+
- tuned.openshift.io
100+
resources:
101+
- tuneds
102+
verbs:
103+
- '*'
104+
- apiGroups:
105+
- node.k8s.io
106+
resources:
107+
- runtimeclasses
108+
verbs:
109+
- '*'
110+
serviceAccountName: performance-operator
111+
deployments:
112+
- name: performance-operator
113+
spec:
114+
replicas: 1
115+
selector:
116+
matchLabels:
117+
name: performance-operator
118+
strategy: {}
119+
template:
120+
metadata:
121+
labels:
122+
name: performance-operator
123+
spec:
124+
affinity:
125+
nodeAffinity:
126+
requiredDuringSchedulingIgnoredDuringExecution:
127+
nodeSelectorTerms:
128+
- matchExpressions:
129+
- key: node-role.kubernetes.io/master
130+
operator: Exists
131+
containers:
132+
- command:
133+
- performance-operator
134+
env:
135+
- name: WATCH_NAMESPACE
136+
valueFrom:
137+
fieldRef:
138+
fieldPath: metadata.annotations['olm.targetNamespaces']
139+
- name: POD_NAME
140+
valueFrom:
141+
fieldRef:
142+
fieldPath: metadata.name
143+
- name: OPERATOR_NAME
144+
value: performance-operator
145+
image: REPLACE_IMAGE
146+
imagePullPolicy: Always
147+
name: performance-operator
148+
resources: {}
149+
serviceAccountName: performance-operator
150+
tolerations:
151+
- effect: NoSchedule
152+
key: node-role.kubernetes.io/master
153+
permissions:
154+
- rules:
155+
- apiGroups:
156+
- ""
157+
resources:
158+
- pods
159+
- services
160+
- services/finalizers
161+
- configmaps
162+
verbs:
163+
- '*'
164+
- apiGroups:
165+
- apps
166+
resources:
167+
- deployments
168+
- daemonsets
169+
- replicasets
170+
- statefulsets
171+
verbs:
172+
- '*'
173+
- apiGroups:
174+
- apps
175+
resourceNames:
176+
- performance-operator
177+
resources:
178+
- deployments/finalizers
179+
verbs:
180+
- update
181+
- apiGroups:
182+
- monitoring.coreos.com
183+
resources:
184+
- servicemonitors
185+
verbs:
186+
- '*'
187+
serviceAccountName: performance-operator
188+
strategy: deployment
189+
installModes:
190+
- supported: true
191+
type: OwnNamespace
192+
- supported: true
193+
type: SingleNamespace
194+
- supported: false
195+
type: MultiNamespace
196+
- supported: true
197+
type: AllNamespaces
198+
keywords:
199+
- numa
200+
- realtime
201+
- cpu pinning
202+
- hugepages
203+
links:
204+
- name: Source Code
205+
url: https://github.com/openshift-kni/performance-addon-operators
206+
maturity: alpha
207+
provider:
208+
name: Red Hat
209+
version: 4.6.2

0 commit comments

Comments
 (0)