Merge pull request #88 from instana/os_support_tagging

add arch and os affinities and CSV labels
instana · Nov 3, 2022 · 30b4149 · 30b4149
2 parents 1791857 + bd817ad
commit 30b4149
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/bundle/manifests/instana-agent-operator.clusterserviceversion.yaml b/bundle/manifests/instana-agent-operator.clusterserviceversion.yaml
@@ -58,6 +58,11 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/instana/instana-agent-operator
     support: Instana
+  labels:
+    operatorframework.io/arch.amd64: supported
+    operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
+    operatorframework.io/os.linux: supported
   name: instana-agent-operator.v0.0.1
   namespace: placeholder
 spec:
@@ -371,6 +376,23 @@ spec:
               labels:
                 control-plane: controller-manager
             spec:
+              affinity:
+                nodeAffinity:
+                  requiredDuringSchedulingIgnoredDuringExecution:
+                    nodeSelectorTerms:
+                    - matchExpressions:
+                      - key: kubernetes.io/os
+                        operator: In
+                        values:
+                        - linux
+                    - matchExpressions:
+                      - key: kubernetes.io/arch
+                        operator: In
+                        values:
+                        - amd64
+                        - ppc64le
+                        - s390x
+                        - arm64
               containers:
               - args:
                 - --leader-elect

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -22,6 +22,23 @@ spec:
       labels:
         control-plane: controller-manager
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
+              - matchExpressions:
+                  - key: kubernetes.io/arch
+                    operator: In
+                    values:
+                      - amd64
+                      - ppc64le
+                      - s390x
+                      - arm64
       containers:
       - command:
         - /manager

diff --git a/config/manifests/bases/instana-agent-operator.clusterserviceversion.yaml b/config/manifests/bases/instana-agent-operator.clusterserviceversion.yaml
@@ -33,8 +33,14 @@ metadata:
     description: Fully automated Application Performance Monitoring (APM) for microservices.
     repository: https://github.com/instana/instana-agent-operator
     support: Instana
+  labels:
+    operatorframework.io/os.linux: supported
+    operatorframework.io/arch.amd64: supported
+    operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
   name: instana-agent-operator.v0.0.0
   namespace: placeholder
+
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
@@ -316,12 +322,6 @@ spec:
               serviceAccountName: instana-agent-operator
     strategy: deployment
   installModes:
-  - supported: true
-    type: OwnNamespace
-  - supported: true
-    type: SingleNamespace
-  - supported: true
-    type: MultiNamespace
   - supported: true
     type: AllNamespaces
   keywords: