Merge pull request #153 from ProblemSetters/kubernetes-ecr-secret-fix

Kubernetes ECR secret fix

Author: ya-developer

Makefile.blackbox

@@ -52,7 +52,7 @@ all: uninstall install setup solve check
 install:
 	docker login --username AWS --password-stdin 134148934511.dkr.ecr.us-east-1.amazonaws.com < <(docker run -it --env="AWS_DEFAULT_REGION=$(BLACKBOX_AWS_DEFAULT_REGION)" --env="AWS_ACCESS_KEY_ID=$(BLACKBOX_AWS_ACCESS_KEY_ID)" --env="AWS_SECRET_ACCESS_KEY=$(BLACKBOX_AWS_SECRET_ACCESS_KEY)" --rm amazon/aws-cli:2.11.25 ecr get-login-password)
 	cat <(echo FROM 134148934511.dkr.ecr.us-east-1.amazonaws.com/hr/blackbox_2404:abstract) <(echo RUN groupadd docker) | docker buildx build --build-arg="BLACKBOX_USER=$(BLACKBOX_USER)" --build-arg="BLACKBOX_USER_NAME=$(BLACKBOX_USER_NAME)" --build-arg="BLACKBOX_USER_HOME=$(BLACKBOX_USER_HOME)" --build-arg="BLACKBOX_VERSION=$(BLACKBOX_VERSION)" --network="host" --progress="plain" --tag="blackbox:$(BLACKBOX_HOST)" -
-	docker run -di --group-add docker --hostname="blackbox" --name="$(BLACKBOX_HOST)" --privileged --cgroupns=host $(if $(filter debug,$(MAKECMDGOALS)),--volume="$(BLACKBOX_DIR):/blackbox:ro") --volume="$(call blackbox/pwd)/setup.sh:$(BLACKBOX_USER_HOME)/setup.sh:ro" --volume="$(call blackbox/pwd)/check.sh:$(BLACKBOX_USER_HOME)/check.sh:ro" --volume="$(call blackbox/pwd)/solve.sh:$(BLACKBOX_USER_HOME)/solve.sh:ro" blackbox:$(BLACKBOX_HOST) >/dev/null
+	docker run -di --group-add docker --hostname="blackbox" --name="$(BLACKBOX_HOST)" --privileged --cgroupns=host $(if $(filter debug,$(MAKECMDGOALS)),--volume="$(BLACKBOX_DIR):/blackbox:ro") --volume="$(call blackbox/pwd)/setup.sh:$(BLACKBOX_USER_HOME)/setup.sh:ro" --volume="$(call blackbox/pwd)/check.sh:$(BLACKBOX_USER_HOME)/check.sh:ro" --volume="$(call blackbox/pwd)/solve.sh:$(BLACKBOX_USER_HOME)/solve.sh:ro" --volume="$(call blackbox/pwd)/evaluate.sh:$(BLACKBOX_USER_HOME)/evaluate.sh:ro" blackbox:$(BLACKBOX_HOST) >/dev/null
 
 setup:
 	docker exec -it --env="BLACKBOX_FLAG__DEBUG_MODE=$(BLACKBOX_FLAG__DEBUG_MODE)" --env="BLACKBOX_FLAG__STEP_PROVISION=$(BLACKBOX_FLAG__STEP_PROVISION)" --env="BLACKBOX_USER_QUESTION_DIR=$(BLACKBOX_USER_QUESTION_DIR)" --env="BLACKBOX_VERSION=$(BLACKBOX_VERSION)" $(BLACKBOX_HOST) $(SHELL) setup.sh
@@ -61,6 +61,9 @@ solve:
 	docker exec -it --user="$(BLACKBOX_USER)" $(BLACKBOX_HOST) $(SHELL) solve.sh
 	docker exec -it -w $(BLACKBOX_USER_QUESTION_DIR) --user="$(BLACKBOX_USER)" $(BLACKBOX_HOST) $(SHELL) -c "source /blackbox/blackbox &>/dev/null; solve"
 
+evaluate:
+	docker exec -it $(BLACKBOX_HOST) $(SHELL) evaluate.sh
+
 check:
 	docker exec -it --env="BLACKBOX_SPAWN=$(BLACKBOX_SPAWN)" --env="BLACKBOX_USER_QUESTION_DIR=$(BLACKBOX_USER_QUESTION_DIR)" --env="BLACKBOX_FLAG__DEBUG_MODE=$(BLACKBOX_FLAG__DEBUG_MODE)" --env="BLACKBOX_FLAG__STEP_PROVISION=$(BLACKBOX_FLAG__STEP_PROVISION)" --env="BLACKBOX_FLAG__STEP_BUILD=$(BLACKBOX_FLAG__STEP_BUILD)" --env="BLACKBOX_FLAG__STEP_EVALUATE=$(BLACKBOX_FLAG__STEP_EVALUATE)" --env="BLACKBOX_VERSION=$(BLACKBOX_VERSION)" $(BLACKBOX_HOST) $(SHELL) check.sh
 

module/kubernetes-stdl/setup/provision.step

@@ -7,14 +7,11 @@
 blackbox.module.kubernetes-stdl.setup.provision() {
   : <<< blackbox.framework.module.abstract.setup.provision:step
 
-  blackbox.framework.inventory.provision k3s && {
-    service k3s start && {
-      sleep 30 # TODO: implement launcher
-      kubectl create secret generic ecr --from-file=.dockerconfigjson=/root/.docker/config.json --type=kubernetes.io/dockerconfigjson && {
-        kubectl describe secrets/ecr
-      }
-    }
-  }
+  blackbox.framework.inventory.provision k3s
+  service k3s start
+  sleep 30 # TODO: implement launcher
+  kubectl create secret generic ecr --from-file=.dockerconfigjson=/root/.docker/config.json --type=kubernetes.io/dockerconfigjson
+  kubectl describe secrets/ecr
 
   rm -f /usr/local/bin/solve
 }

module/kubernetes/check/provision.step

@@ -7,14 +7,11 @@
 blackbox.module.kubernetes.check.provision() {
   : <<< blackbox.framework.module.abstract.check.provision:step
 
-  docker exec -i "$BLACKBOX_SPAWN" service docker start && {
-    docker exec -i -w "$BLACKBOX_USER_QUESTION_DIR" "$BLACKBOX_SPAWN" "$BASH" /dev/stdin "$BLACKBOX_MODULE_NAME" "$BLACKBOX_MODULE_ACTION_NAME" "$BLACKBOX_QUESTION_ID" 2>&1 <<<"source /blackbox/blackbox &>/dev/null; blackbox.framework.inventory.ecr.login"
-  }
+  docker exec -i "$BLACKBOX_SPAWN" service docker start
+  docker exec -i -w "$BLACKBOX_USER_QUESTION_DIR" "$BLACKBOX_SPAWN" "$BASH" /dev/stdin "$BLACKBOX_MODULE_NAME" "$BLACKBOX_MODULE_ACTION_NAME" "$BLACKBOX_QUESTION_ID" 2>&1 <<<"source /blackbox/blackbox &>/dev/null; blackbox.framework.inventory.ecr.login"
 
-  docker exec -i "$BLACKBOX_SPAWN" service k3s start && {
-    sleep 30 # TODO: implement healthcheck
-    docker exec -i "$BLACKBOX_SPAWN" kubectl create secret generic ecr --from-file=.dockerconfigjson=/root/.docker/config.json --type=kubernetes.io/dockerconfigjson && {
-      kubectl describe secrets/ecr
-    }
-  }
+  docker exec -i "$BLACKBOX_SPAWN" service k3s start
+  sleep 30 # TODO: implement healthcheck
+  docker exec -i "$BLACKBOX_SPAWN" kubectl create secret generic ecr --from-file=.dockerconfigjson=/root/.docker/config.json --type=kubernetes.io/dockerconfigjson
+  docker exec -i "$BLACKBOX_SPAWN" kubectl describe secrets/ecr
 }

module/kubernetes/setup/provision.step

@@ -7,14 +7,11 @@
 blackbox.module.kubernetes.setup.provision() {
   : <<< blackbox.framework.module.abstract.setup.provision:step
 
-  blackbox.framework.inventory.provision k3s && {
-    service k3s start && {
-      sleep 30 # TODO: implement launcher
-      kubectl create secret generic ecr --from-file=.dockerconfigjson=/root/.docker/config.json --type=kubernetes.io/dockerconfigjson && {
-        kubectl describe secrets/ecr
-      }
-    }
-  }
+  blackbox.framework.inventory.provision k3s
+  service k3s start
+  sleep 30 # TODO: implement launcher
+  kubectl create secret generic ecr --from-file=.dockerconfigjson=/root/.docker/config.json --type=kubernetes.io/dockerconfigjson
+  kubectl describe secrets/ecr
 
   blackbox.framework.inventory.install.file script.sh </blackbox/module/kubernetes/setup/provision/rootfs/home/%/%/script.sh
 }