Merge pull request #120 from nre-learning/support-curriculum-version

Support option to specify curriculum version

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Limit volume mount to lesson directory [#109](https://github.com/nre-learning/syringe/pull/109)
 - Add configuration options to influxdb export [#108](https://github.com/nre-learning/syringe/pull/108)
 - Add config flag to permit egress traffic [#119](https://github.com/nre-learning/syringe/pull/119)
+- Support option to specify curriculum version [#120](https://github.com/nre-learning/syringe/pull/120)
 
 ## v0.3.2 - April 19, 2019
 

api/exp/lessons.go

@@ -208,6 +208,11 @@ func validateLesson(syringeConfig *config.SyringeConfig, lesson *pb.Lesson) erro
 			return fail
 		}
 
+		if strings.Contains(ep.Image, ":") {
+			log.Error("Tags are not allowed in endpoint image refs")
+			return fail
+		}
+
 		if ep.ConfigurationType == "" {
 			continue
 		}

config/config.go

@@ -28,6 +28,7 @@ type SyringeConfig struct {
 	TSDBEnabled        bool
 
 	CurriculumLocal      bool
+	CurriculumVersion    string
 	CurriculumRepoRemote string
 	CurriculumRepoBranch string
 
@@ -107,6 +108,15 @@ func LoadConfigVars() (*SyringeConfig, error) {
 		config.CurriculumLocal = true
 	}
 
+	// +syringeconfig SYRINGE_CURRICULUM_VERSION is the version of the curriculum to use.
+	version := os.Getenv("SYRINGE_CURRICULUM_VERSION")
+	if version == "" {
+		// This is used to form docker image refs, so we're specifying "latest" here by default.
+		config.CurriculumVersion = "latest"
+	} else {
+		config.CurriculumVersion = version
+	}
+
 	// +syringeconfig SYRINGE_CURRICULUM_REPO_REMOTE is the git repo from which pull lesson content
 	remote := os.Getenv("SYRINGE_CURRICULUM_REPO_REMOTE")
 	if remote == "" {

config/config_test.go

@@ -64,6 +64,7 @@ func TestConfigJSON(t *testing.T) {
 		TSDBExportInterval:   0,
 		TSDBEnabled:          false,
 		CurriculumLocal:      false,
+		CurriculumVersion:    "latest",
 		CurriculumRepoRemote: "https://github.com/nre-learning/nrelabs-curriculum.git",
 		CurriculumRepoBranch: "master",
 		AllowEgress:          false,

scheduler/pods.go

@@ -80,7 +80,7 @@ func (ls *LessonScheduler) createPod(ep *pb.Endpoint, networks []string, req *Le
 			Containers: []corev1.Container{
 				{
 					Name:  ep.GetName(),
-					Image: ep.GetImage(),
+					Image: fmt.Sprintf("%s:%s", ep.GetImage(), ls.SyringeConfig.CurriculumVersion),
 
 					// Omitting in order to keep things speedy. For debugging, uncomment this, and the image will be pulled every time.
 					ImagePullPolicy: "Always",
@@ -116,10 +116,10 @@ func (ls *LessonScheduler) createPod(ep *pb.Endpoint, networks []string, req *Le
 	// Privileged status is currently required by both the lite and full vqfx versions.
 	// It may also be required by other images we bring on board.
 	privilegedImages := map[string]string{
-		"antidotelabs/vqfx:snap1":         "",
-		"antidotelabs/vqfx:snap2":         "",
-		"antidotelabs/vqfx:snap3":         "",
-		"antidotelabs/vqfx-full:18.1R1.9": "",
+		"antidotelabs/container-vqfx": "",
+		// "antidotelabs/vqfx:snap2":         "",
+		// "antidotelabs/vqfx:snap3":         "",
+		// "antidotelabs/vqfx-full:18.1R1.9": "",
 	}
 	if _, ok := privilegedImages[ep.Image]; ok {
 		b := true