This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 994269908aa [sonataflow-operator] NO-ISSUE: Removed hard-coded
control-plane labels from operator manifests (#3020)
994269908aa is described below
commit 994269908aac918811639c6b7f53c3e58747e56f
Author: Ricardo Zanini <[email protected]>
AuthorDate: Mon Mar 24 10:58:28 2025 -0300
[sonataflow-operator] NO-ISSUE: Removed hard-coded control-plane labels
from operator manifests (#3020)
Signed-off-by: Ricardo Zanini <[email protected]>
---
packages/sonataflow-operator/Makefile | 2 +-
.../config/default/kustomization.yaml | 5 ++
.../config/manager/manager.yaml | 9 +---
.../config/prometheus/monitor.yaml | 4 +-
.../config/rbac/auth_proxy_service.yaml | 4 +-
packages/sonataflow-operator/operator.yaml | 59 +++++++++++++++++++---
packages/sonataflow-operator/package.json | 4 +-
7 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/packages/sonataflow-operator/Makefile
b/packages/sonataflow-operator/Makefile
index c21179bae11..d0a95cc0f73 100644
--- a/packages/sonataflow-operator/Makefile
+++ b/packages/sonataflow-operator/Makefile
@@ -457,7 +457,7 @@ endif
.PHONY: full-test-e2e
full-test-e2e: create-cluster load-docker-image deploy deploy-knative
deploy-prometheus
sleep 30
- kubectl wait pod -A -l control-plane=sonataflow-operator --for
condition=Ready --timeout 120s
+ kubectl wait pod -A -l app.kubernetes.io/name=sonataflow-operator --for
condition=Ready --timeout 120s
@$(MAKE) test-e2e label=platform
@$(MAKE) test-e2e label=cluster
@$(MAKE) test-e2e label=flows-monitoring
diff --git a/packages/sonataflow-operator/config/default/kustomization.yaml
b/packages/sonataflow-operator/config/default/kustomization.yaml
index a37d8452040..1381490821e 100644
--- a/packages/sonataflow-operator/config/default/kustomization.yaml
+++ b/packages/sonataflow-operator/config/default/kustomization.yaml
@@ -15,6 +15,11 @@
# specific language governing permissions and limitations
# under the License.
+# Labels to add to all resources and selectors.
+#
https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/#labels
+commonLabels:
+ app.kubernetes.io/name: sonataflow-operator
+
# Adds namespace to all resources.
namespace: sonataflow-operator-system
diff --git a/packages/sonataflow-operator/config/manager/manager.yaml
b/packages/sonataflow-operator/config/manager/manager.yaml
index fa3870754d2..59d671476b7 100644
--- a/packages/sonataflow-operator/config/manager/manager.yaml
+++ b/packages/sonataflow-operator/config/manager/manager.yaml
@@ -18,8 +18,6 @@
apiVersion: v1
kind: Namespace
metadata:
- labels:
- control-plane: sonataflow-operator
name: system
---
apiVersion: apps/v1
@@ -27,20 +25,17 @@ kind: Deployment
metadata:
name: controller-manager
namespace: system
- labels:
- control-plane: sonataflow-operator
- app.kubernetes.io/name: sonataflow-operator
spec:
selector:
matchLabels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
replicas: 1
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
spec:
securityContext:
runAsNonRoot: true
diff --git a/packages/sonataflow-operator/config/prometheus/monitor.yaml
b/packages/sonataflow-operator/config/prometheus/monitor.yaml
index 472617f9e29..ba967ed5c84 100644
--- a/packages/sonataflow-operator/config/prometheus/monitor.yaml
+++ b/packages/sonataflow-operator/config/prometheus/monitor.yaml
@@ -19,8 +19,6 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
- labels:
- control-plane: sonataflow-operator
name: controller-manager-metrics-monitor
namespace: system
spec:
@@ -33,4 +31,4 @@ spec:
insecureSkipVerify: true
selector:
matchLabels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
diff --git a/packages/sonataflow-operator/config/rbac/auth_proxy_service.yaml
b/packages/sonataflow-operator/config/rbac/auth_proxy_service.yaml
index be8c20ae599..b6a3898a3e5 100644
--- a/packages/sonataflow-operator/config/rbac/auth_proxy_service.yaml
+++ b/packages/sonataflow-operator/config/rbac/auth_proxy_service.yaml
@@ -18,8 +18,6 @@
apiVersion: v1
kind: Service
metadata:
- labels:
- control-plane: sonataflow-operator
name: controller-manager-metrics-service
namespace: system
spec:
@@ -29,4 +27,4 @@ spec:
protocol: TCP
targetPort: https
selector:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
diff --git a/packages/sonataflow-operator/operator.yaml
b/packages/sonataflow-operator/operator.yaml
index 400df7324de..e54b4aad101 100644
--- a/packages/sonataflow-operator/operator.yaml
+++ b/packages/sonataflow-operator/operator.yaml
@@ -19,7 +19,7 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-system
---
apiVersion: apiextensions.k8s.io/v1
@@ -27,6 +27,8 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflowbuilds.sonataflow.org
spec:
group: sonataflow.org
@@ -419,6 +421,8 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflowclusterplatforms.sonataflow.org
spec:
group: sonataflow.org
@@ -551,6 +555,8 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflowplatforms.sonataflow.org
spec:
group: sonataflow.org
@@ -17467,6 +17473,8 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflows.sonataflow.org
spec:
group: sonataflow.org
@@ -27577,12 +27585,16 @@ spec:
apiVersion: v1
kind: ServiceAccount
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-controller-manager
namespace: sonataflow-operator-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-leader-election-role
namespace: sonataflow-operator-system
rules:
@@ -27621,6 +27633,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-builder-manager-role
rules:
- apiGroups:
@@ -27689,6 +27703,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-knative-manager-role
rules:
- apiGroups:
@@ -27741,6 +27757,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-leases
rules:
- apiGroups:
@@ -27760,6 +27778,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-manager-role
rules:
- apiGroups:
@@ -27832,6 +27852,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-metrics-reader
rules:
- nonResourceURLs:
@@ -27842,6 +27864,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-openshift-manager-role
rules:
- apiGroups:
@@ -27938,6 +27962,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-proxy-role
rules:
- apiGroups:
@@ -27956,6 +27982,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-service-discovery-role
rules:
- apiGroups:
@@ -28014,6 +28042,8 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-leader-election-rolebinding
namespace: sonataflow-operator-system
roleRef:
@@ -28028,6 +28058,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-builder-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28041,6 +28073,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-knative-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28054,6 +28088,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-leases-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28067,6 +28103,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28080,6 +28118,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-openshift-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28093,6 +28133,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-proxy-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28106,6 +28148,8 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-service-discovery-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -28146,6 +28190,8 @@ data:
-Djava.util.logging.manager=org.jboss.logmanager.LogManager\"\nENV
JAVA_APP_JAR=\"/deployments/quarkus-run.jar\"\n"
kind: ConfigMap
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-builder-config
namespace: sonataflow-operator-system
---
@@ -28218,6 +28264,8 @@ data:
kogitoEventsGroupingCompress: false
kind: ConfigMap
metadata:
+ labels:
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-controllers-config
namespace: sonataflow-operator-system
---
@@ -28225,7 +28273,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
name: sonataflow-operator-controller-manager-metrics-service
namespace: sonataflow-operator-system
spec:
@@ -28235,27 +28283,26 @@ spec:
protocol: TCP
targetPort: https
selector:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
---
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app.kubernetes.io/name: sonataflow-operator
- control-plane: sonataflow-operator
name: sonataflow-operator-controller-manager
namespace: sonataflow-operator-system
spec:
replicas: 1
selector:
matchLabels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
- control-plane: sonataflow-operator
+ app.kubernetes.io/name: sonataflow-operator
spec:
containers:
- args:
diff --git a/packages/sonataflow-operator/package.json
b/packages/sonataflow-operator/package.json
index f957906c8b6..4b23c26befb 100644
--- a/packages/sonataflow-operator/package.json
+++ b/packages/sonataflow-operator/package.json
@@ -25,8 +25,8 @@
"controllers:update:cfg": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && make update-config",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:win32": "echo 'Image build not supported on Windows
and macOS'",
- "image:build:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make container-build\"",
+ "image:build:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make container-build\"",
+ "image:build:win32": "echo 'Image build not supported on Windows'",
"image:bundle:build": "run-script-os",
"image:bundle:build:darwin:win32": "echo 'Build Operator bundle image not
supported on Windows and macOS'",
"image:bundle:build:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make bundle bundle-build\"",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
