fix: Added/fixed tolerations for CRDs (#787)

argoproj · Jul 30, 2020 · adee1b5 · adee1b5
1 parent 527a45f
commit adee1b5
Show file tree

Hide file tree

Showing 18 changed files with 567 additions and 296 deletions.
diff --git a/api/event-bus.html b/api/event-bus.html
diff --git a/api/event-bus.md b/api/event-bus.md
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/sensor.html b/api/sensor.html
diff --git a/api/sensor.md b/api/sensor.md
diff --git a/controllers/eventbus/installer/nats.go b/controllers/eventbus/installer/nats.go
@@ -640,6 +640,7 @@ func (i *natsInstaller) buildStatefulSetSpec(serviceName, configmapName, authSec
 			},
 			Spec: corev1.PodSpec{
 				NodeSelector: i.eventBus.Spec.NATS.Native.NodeSelector,
+				Tolerations:  i.eventBus.Spec.NATS.Native.Tolerations,
 				Volumes: []corev1.Volume{
 					{
 						Name: "config-volume",

diff --git a/controllers/eventsource/resource.go b/controllers/eventsource/resource.go
@@ -314,6 +314,8 @@ func buildDeploymentSpec(args *AdaptorArgs) (*appv1.DeploymentSpec, error) {
 				Volumes:         args.EventSource.Spec.Template.Volumes,
 				SecurityContext: args.EventSource.Spec.Template.SecurityContext,
 				NodeSelector:    args.EventSource.Spec.Template.NodeSelector,
+				Tolerations:     args.EventSource.Spec.Template.Tolerations,
+				Affinity:        args.EventSource.Spec.Template.Affinity,
 			},
 		},
 	}

diff --git a/controllers/sensor/resource.go b/controllers/sensor/resource.go
@@ -249,6 +249,7 @@ func buildDeploymentSpec(args *AdaptorArgs) (*appv1.DeploymentSpec, error) {
 				Volumes:         args.Sensor.Spec.Template.Volumes,
 				SecurityContext: args.Sensor.Spec.Template.SecurityContext,
 				NodeSelector:    args.Sensor.Spec.Template.NodeSelector,
+				Tolerations:     args.Sensor.Spec.Template.Tolerations,
 			},
 		},
 	}, nil

diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go
diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto
diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/eventbus/v1alpha1/types.go b/pkg/apis/eventbus/v1alpha1/types.go
@@ -78,6 +78,9 @@ type NativeStrategy struct {
 	// More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty" protobuf:"bytes,7,rep,name=nodeSelector"`
+	// If specified, the pod's tolerations.
+	// +optional
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty" protobuf:"bytes,8,rep,name=tolerations"`
 }
 
 // ContainerTemplate defines customized spec for a container

diff --git a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go