instancer

Makefile

@@ -6,4 +6,7 @@ test:
 	rm -r tmp
 
 build:
-	GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o ./out/instanced
+	GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o ./out/instanced
+
+docker:
+	docker build . --tag us.gcr.io/maplectf/instanced:latest && docker push us.gcr.io/maplectf/instanced:latest

src/instancer.go

@@ -105,15 +105,15 @@ func (in *Instancer) LoadCRDs() {
 	log := in.log
 	// Test CRDs
 	log.Debug().Msg("querying CRDs")
-	crdChallObjs, err := in.QueryInstancedChallenges("challenges")
+	var err error
+	in.challengeTmpls, err = in.QueryInstancedChallenges("challenges")
 	if err != nil {
 		log.Debug().Err(err).Msg("error retrieving challenge definitions from CRDs")
 	}
-	for k := range crdChallObjs {
+	for k := range in.challengeTmpls {
 		log.Info().Str("challenge", k).Msg("parsed challenge template")
 	}
-	log.Info().Int("count", len(crdChallObjs)).Msg("parsed challenges")
-	in.challengeTmpls = crdChallObjs
+	log.Info().Int("count", len(in.challengeTmpls)).Msg("parsed challenges")
 }
 
 func (in *Instancer) DestoryExpiredInstances() {
@@ -222,7 +222,7 @@ func (in *Instancer) GetTeamChallengeStates(teamID string) ([]InstanceRecord, er
 		return nil, err
 	}
 	//for k := range in.challengeObjs {
-	for k := range in.config.Challenges {
+	for k := range in.challengeTmpls {
 		active := false
 		for _, v := range instances {
 			if v.Challenge == k {

src/k8sclient.go

@@ -171,6 +171,11 @@ func (in *Instancer) QueryInstancedChallenges(namespace string) (map[string]*tem
 	ret := make(map[string]*template.Template)
 
 	for _, c := range chalList.Items {
+		hidden, found, err := unstructured.NestedBool(c.Object, "spec", "hidden")
+		if err != nil || found && hidden {
+			in.log.Info().Err(err).Str("challenge", c.GetName()).Msg("skipping hidden challenge")
+			continue
+		}
 		tmplStr, found, err := unstructured.NestedString(c.Object, "spec", "challengeTemplate")
 		if err != nil || !found {
 			fmt.Printf("template not found for challenge crd %v: error=%v", c.GetName(), err)

src/webserver.go

@@ -19,6 +19,8 @@ func (in *Instancer) registerEndpoints() {
 	in.echo.DELETE("/instances", in.handleInstanceDelete)
 
 	in.echo.GET("/challenges", in.handleInstanceListTeam)
+
+	in.echo.POST("/reload", in.handleCRDReload)
 }
 
 type InstancesResponse struct {
@@ -133,3 +135,8 @@ func (in *Instancer) handleInstanceListTeam(c echo.Context) error {
 	// todo: properly marshal records
 	return c.JSON(http.StatusOK, records)
 }
+
+func (in *Instancer) handleCRDReload(c echo.Context) error {
+	go in.LoadCRDs()
+	return c.JSON(http.StatusAccepted, "accepted")
+}