Merge pull request #117 from sylabs/staging

Set up staging environment

Author: Sasha Yakovtseva

.circleci/config.yml

@@ -106,11 +106,17 @@ jobs:
       - run:
           name: Publish images
           command: |
+            TAG=latest
+            if [ "${CIRCLE_BRANCH}" != "master" ]
+            then
+              TAG=${CIRCLE_BRANCH}
+            fi
+
             cd $GOPATH/src/github.com/sylabs/slurm-operator
             cat > push.sh <<EOF
             #!/usr/bin/expect -f
             set timeout -1
-            spawn make push
+            spawn make push TAG=${TAG}
             expect "Enter key passphrase : "
             send -- "\r"
             expect "Enter key passphrase : "
@@ -141,6 +147,7 @@ workflows:
             branches:
               only:
                 - master
+                - staging
           requires:
             - build
             - test

Makefile

@@ -34,12 +34,13 @@ lint:
 	--deadline=3m ./...
 
 .PHONY: push
+push: TAG=latest
 push:
 	$(V)for f in `ls sif` ; do \
-		echo " PUSH" $${f} ; \
+		echo " PUSH" $${f}:${TAG} ; \
 		sudo singularity build sif/$${f}.sif sif/$${f} ;\
 		singularity sign sif/$${f}.sif;\
-		singularity push sif/$${f}.sif library://library/slurm/$${f}:latest;\
+		singularity push sif/$${f}.sif library://library/slurm/$${f}:${TAG};\
 	done
 
 .PHONY: dep

cmd/operator/main.go

@@ -39,6 +39,8 @@ var (
 	metricsPort int32 = 8383
 )
 
+const defaultJobCompanionImage = "cloud.sylabs.io/library/slurm/job-companion:latest"
+
 func printVersion() {
 	glog.Infof("Go Version: %s", runtime.Version())
 	glog.Infof("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH)
@@ -50,6 +52,7 @@ func main() {
 	_ = flag.Set("logtostderr", "true")
 	jcUID := flag.Int64("jc-uid", 1000, "uid to be used for running job-companion containers")
 	jcGID := flag.Int64("jc-gid", 1000, "gid to be used for running job-companion containers")
+	jcImage := flag.String("jc-image", defaultJobCompanionImage, "custom job companion image to use")
 	flag.Parse()
 	defer glog.Flush()
 
@@ -90,8 +93,7 @@ func main() {
 		glog.Fatalf("Failed to add manager to apis scheme: %v", err)
 	}
 
-	// Setup SlurmJob controller
-	sj := slurmjob.NewReconciler(mgr, *jcUID, *jcGID)
+	sj := slurmjob.NewReconciler(mgr, *jcImage, *jcUID, *jcGID)
 	if err := sj.AddToManager(mgr); err != nil {
 		glog.Fatalf("Failed to add controller to manager: %v", err)
 	}

pkg/operator/controller/slurmjob/slurmjob_controller.go

@@ -35,29 +35,28 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
-const (
-	jobCompanionImage = "cloud.sylabs.io/library/slurm/job-companion:latest"
-)
-
 // Reconciler reconciles a SlurmJob object
 type Reconciler struct {
 	// This client, initialized using mgr.Client() above, is a split client
 	// that reads objects from the cache and writes to the apiserver
-	client client.Client
-	scheme *runtime.Scheme
+	client  client.Client
+	scheme  *runtime.Scheme
+	jcImage string
 
 	jcUID int64
 	jcGID int64
 }
 
 // NewReconciler returns a new SlurmJob controller.
-func NewReconciler(mgr manager.Manager, jcUID, jcGID int64) *Reconciler {
-	return &Reconciler{
-		client: mgr.GetClient(),
-		scheme: mgr.GetScheme(),
-		jcUID:  jcUID,
-		jcGID:  jcGID,
+func NewReconciler(mgr manager.Manager, jcImage string, jcUID, jcGID int64) *Reconciler {
+	r := &Reconciler{
+		client:  mgr.GetClient(),
+		scheme:  mgr.GetScheme(),
+		jcUID:   jcUID,
+		jcGID:   jcGID,
+		jcImage: jcImage,
 	}
+	return r
 }
 
 // AddToManager adds SlurmJob Reconciler to the given Manager.
@@ -197,7 +196,7 @@ func (r *Reconciler) newPodForSJ(sj *slurmv1alpha1.SlurmJob) *corev1.Pod {
 			Containers: []corev1.Container{
 				{
 					Name:            "jt1",
-					Image:           jobCompanionImage,
+					Image:           r.jcImage,
 					ImagePullPolicy: corev1.PullIfNotPresent,
 					Args:            args,
 					Resources: corev1.ResourceRequirements{