Merge pull request #457 from perdasilva/update_catsrc_tolerations

Bug 1927478: Add catalog source pod spec overrides

Author: openshift-merge-robot

defaults/01_redhat_operators.cr.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: "openshift-marketplace"
   annotations:
     target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-    operatorframework.io/priorityclass: 'system-cluster-critical'
 spec:
   sourceType: grpc
   image: registry.redhat.io/redhat/redhat-operator-index:v4.10
@@ -15,3 +14,20 @@ spec:
   updateStrategy:
     registryPoll:
       interval: 10m
+  grpcPodConfig:
+    nodeSelector:
+        node-role.kubernetes.io/master: ""
+        kubernetes.io/os: "linux"
+    priorityClassName: "system-cluster-critical"
+    tolerations:
+    - key: "node-role.kubernetes.io/master"
+      operator: Exists
+      effect: "NoSchedule"
+    - key: "node.kubernetes.io/unreachable"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120
+    - key: "node.kubernetes.io/not-ready"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120

defaults/02_certified_operators.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: "openshift-marketplace"
   annotations:
     target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-    operatorframework.io/priorityclass: 'system-cluster-critical'
 spec:
   sourceType: grpc
   image: registry.redhat.io/redhat/certified-operator-index:v4.10
@@ -15,3 +14,20 @@ spec:
   updateStrategy:
     registryPoll:
       interval: 10m
+  grpcPodConfig:
+    nodeSelector:
+        node-role.kubernetes.io/master: ""
+        kubernetes.io/os: "linux"
+    priorityClassName: "system-cluster-critical"
+    tolerations:
+    - key: "node-role.kubernetes.io/master"
+      operator: Exists
+      effect: "NoSchedule"
+    - key: "node.kubernetes.io/unreachable"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120
+    - key: "node.kubernetes.io/not-ready"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120

defaults/03_community_operators.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: "openshift-marketplace"
   annotations:
     target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-    operatorframework.io/priorityclass: 'system-cluster-critical'
 spec:
   sourceType: grpc
   image: registry.redhat.io/redhat/community-operator-index:v4.10
@@ -15,3 +14,20 @@ spec:
   updateStrategy:
     registryPoll:
       interval: 10m
+  grpcPodConfig:
+    nodeSelector:
+        node-role.kubernetes.io/master: ""
+        kubernetes.io/os: "linux"
+    priorityClassName: "system-cluster-critical"
+    tolerations:
+    - key: "node-role.kubernetes.io/master"
+      operator: Exists
+      effect: "NoSchedule"
+    - key: "node.kubernetes.io/unreachable"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120
+    - key: "node.kubernetes.io/not-ready"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120

defaults/04_redhat_marketplace.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: "openshift-marketplace"
   annotations:
     target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-    operatorframework.io/priorityclass: 'system-cluster-critical'
 spec:
   sourceType: grpc
   image: registry.redhat.io/redhat/redhat-marketplace-index:v4.10
@@ -15,3 +14,20 @@ spec:
   updateStrategy:
     registryPoll:
       interval: 10m
+  grpcPodConfig:
+    nodeSelector:
+        node-role.kubernetes.io/master: ""
+        kubernetes.io/os: "linux"
+    priorityClassName: "system-cluster-critical"
+    tolerations:
+    - key: "node-role.kubernetes.io/master"
+      operator: Exists
+      effect: "NoSchedule"
+    - key: "node.kubernetes.io/unreachable"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120
+    - key: "node.kubernetes.io/not-ready"
+      operator: "Exists"
+      effect: "NoExecute"
+      tolerationSeconds: 120

go.mod

@@ -3,7 +3,6 @@ module github.com/operator-framework/operator-marketplace
 go 1.16
 
 require (
-	cloud.google.com/go v0.81.0 // indirect
 	github.com/emicklei/go-restful v2.15.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -15,7 +14,7 @@ require (
 	github.com/openshift/api v0.0.0-20210331193751-3acddb19d360
 	github.com/openshift/client-go v0.0.0-20210331195552-cf6c2669e01f
 	github.com/openshift/library-go v0.0.0-00010101000000-000000000000
-	github.com/operator-framework/api v0.10.5
+	github.com/operator-framework/api v0.11.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0