Merge branch 'main' into mojtaba/595-adding-file-to-image

pkg/instance/build.go

@@ -30,6 +30,7 @@ type build struct {
 	env             map[string]string
 	imageCache      *sync.Map
 	buildDir        string
+	nodeSelector    map[string]string
 }
 
 func (i *Instance) Build() *build {
@@ -214,6 +215,15 @@ func (b *build) buildInitImage(ctx context.Context) error {
 	return factory.PushBuilderImage(ctx, imageName)
 }
 
+func (b *build) SetNodeSelector(nodeSelector map[string]string) error {
+	if !b.instance.IsInState(StatePreparing, StateCommitted) {
+		return ErrSettingNodeSelectorNotAllowed.WithParams(b.instance.state.String())
+	}
+
+	b.nodeSelector = nodeSelector
+	return nil
+}
+
 // Commit commits the instance
 // This function can only be called in the state 'Preparing'
 func (b *build) Commit(ctx context.Context) error {

pkg/instance/errors.go

@@ -114,6 +114,7 @@ var (
 	ErrSrcDoesNotExistOrIsNotDirectory           = errors.New("SrcDoesNotExistOrIsNotDirectory", "src '%s' does not exist or is not a directory")
 	ErrCopyingFolderToInstance                   = errors.New("CopyingFolderToInstance", "error copying folder '%s' to instance '%s")
 	ErrSettingUserNotAllowed                     = errors.New("SettingUserNotAllowed", "setting user is only allowed in state 'Preparing'. Current state is '%s")
+	ErrSettingNodeSelectorNotAllowed             = errors.New("SettingNodeSelectorNotAllowed", "setting node selector is only allowed in state 'Preparing'. Current state is '%s")
 	ErrSettingUser                               = errors.New("SettingUser", "error setting user '%s' for instance '%s")
 	ErrCommittingNotAllowed                      = errors.New("CommittingNotAllowed", "committing is only allowed in state 'Preparing'. Current state is '%s")
 	ErrGettingImageRegistry                      = errors.New("GettingImageRegistry", "error getting image registry")

pkg/instance/execution.go

@@ -418,6 +418,7 @@ func (e *execution) prepareReplicaSetConfig() k8s.ReplicaSetConfig {
 		ServiceAccountName: e.instance.name,
 		ContainerConfig:    containerConfig,
 		SidecarConfigs:     sidecarConfigs,
+		NodeSelector:       e.instance.build.nodeSelector,
 	}
 
 	return k8s.ReplicaSetConfig{

pkg/k8s/pod.go

@@ -63,6 +63,7 @@ type PodConfig struct {
 	ContainerConfig    ContainerConfig   // ContainerConfig for the Pod
 	SidecarConfigs     []ContainerConfig // SideCarConfigs for the Pod
 	Annotations        map[string]string // Annotations to apply to the Pod
+	NodeSelector       map[string]string // NodeSelector to apply to the Pod
 }
 
 // DeployPod creates a new pod in the namespace that k8s client is initiate with if it doesn't already exist.
@@ -596,6 +597,7 @@ func (c *Client) preparePodSpec(spec PodConfig, init bool) v1.PodSpec {
 		InitContainers:     c.prepareInitContainers(spec.ContainerConfig, init),
 		Containers:         []v1.Container{prepareContainer(spec.ContainerConfig)},
 		Volumes:            preparePodVolumes(spec.ContainerConfig),
+		NodeSelector:       spec.NodeSelector,
 	}
 
 	// Prepare sidecar containers and append to the pod spec

pkg/knuu/knuu.go

@@ -109,6 +109,8 @@ func (k *Knuu) HandleStopSignal(ctx context.Context) {
 			k.Logger.Errorf("Error cleaning up resources with timeout handler: %v", err)
 		}
 		k.K8sClient.Terminate()
+		// Allow other signal handlers to run
+		signal.Reset(syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
 		os.Exit(ExitCodeSIGINT)
 	}()
 }