feat: embed the code into the image

Author: johanneswuerbach

0_install.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-mkdir -p ./kube
+mkdir -p /state/kube
 
-if [ ! -f ./kube/config.yaml ]; then
-  kind create cluster -n 5min-idp --kubeconfig ./kube/config.yaml --config ./setup/kind/cluster.yaml
+if [ ! -f /state/kube/config.yaml ]; then
+  kind create cluster -n 5min-idp --kubeconfig /state/kube/config.yaml --config ./setup/kind/cluster.yaml
 fi
 
 # connect current container to the kind network
@@ -14,7 +14,7 @@ if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${container
 fi
 
 # used by humanitec-agent / inside docker to reach the cluster
-kubeconfig_docker=$(pwd)/kube/config-internal.yaml
+kubeconfig_docker=/state/kube/config-internal.yaml
 kind export kubeconfig --internal  -n 5min-idp --kubeconfig "$kubeconfig_docker"
 
 humctl_token=$(yq .token /root/.humctl)

1_demo.sh

@@ -49,6 +49,6 @@ workload_host=$(humctl get active-resources --app 5min-idp --env development -o
 echo "Waiting for workload to be available"
 
 # manually change the host here as the workload host resolves to localhost, which is not reachable from the container
-curl -I --retry 10 --retry-delay 3 --connect-to "$workload_host:30080:5min-idp-control-plane:30080" "http://$workload_host:30080"
+curl -I --retry 10 --retry-delay 3 --retry-all-errors --connect-to "$workload_host:30080:5min-idp-control-plane:30080" --fail "http://$workload_host:30080"
 
 echo "Workload available at: http://$workload_host:30080"

2_cleanup.sh

@@ -8,7 +8,7 @@ if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${container
 fi
 
 humctl_token=$(yq .token /root/.humctl)
-kubeconfig_docker=$(pwd)/kube/config-internal.yaml
+kubeconfig_docker=/state/kube/config-internal.yaml
 
 export HUMANITEC_TOKEN=$humctl_token
 export TF_VAR_humanitec_org=$HUMANITEC_ORG

Dockerfile

@@ -49,6 +49,10 @@ RUN mkdir /tmp/humctl && \
   humctl completion bash > /etc/bash_completion.d/humctl && \
   rm -rf /tmp/humctl
 
+ENV KUBECONFIG="/state/kube/config-internal.yaml"
+
+COPY . /app
+
 WORKDIR /app
 
 ENTRYPOINT ["/bin/bash"]

Makefile

@@ -29,7 +29,7 @@ lint: lint-init
 test: build check-image
 	docker run --rm -i -h 5min-idp --name 5min-idp \
     -e HUMANITEC_ORG \
-    -v $(PWD):/app \
+    -v hum-5min-idp:/state \
     -v $(HOME)/.humctl:/root/.humctl \
     -v /var/run/docker.sock:/var/run/docker.sock \
     --network bridge \

README.md

@@ -23,7 +23,7 @@ export HUMANITEC_ORG=MY_ORG
   ```bash
   docker run --rm -it -h 5min-idp --name 5min-idp --pull always \
     -e HUMANITEC_ORG \
-    -v $(PWD):/app \
+    -v hum-5min-idp:/state \
     -v $HOME/.humctl:/root/.humctl \
     -v /var/run/docker.sock:/var/run/docker.sock \
     --network bridge \

setup/terraform/idp-cluster.tf

@@ -55,7 +55,7 @@ resource "humanitec_resource_definition_criteria" "agent" {
 }
 
 locals {
-  kubeconfig = yamldecode(file(var.agent_kubeconfig))
+  parsed_kubeconfig = yamldecode(file(var.kubeconfig))
 }
 
 resource "humanitec_resource_definition" "local_cluster" {
@@ -67,11 +67,11 @@ resource "humanitec_resource_definition" "local_cluster" {
   driver_inputs = {
     values_string = jsonencode({
       loadbalancer = "0.0.0.0" # ensure dns records are created pointing to localhost
-      cluster_data = local.kubeconfig["clusters"][0]["cluster"]
+      cluster_data = local.parsed_kubeconfig["clusters"][0]["cluster"]
     })
     secrets_string = jsonencode({
       agent_url   = "$${resources['agent#agent'].outputs.url}"
-      credentials = local.kubeconfig["users"][0]["user"]
+      credentials = local.parsed_kubeconfig["users"][0]["user"]
     })
   }
 

setup/terraform/providers.tf

@@ -1,4 +1,8 @@
 terraform {
+  backend "local" {
+    path = "/state/terraform/terraform.tfstate"
+  }
+
   required_providers {
     helm = {
       source  = "hashicorp/helm"
@@ -25,7 +29,6 @@ provider "humanitec" {
   org_id = var.humanitec_org
 }
 
-
 provider "helm" {
   kubernetes {
     config_path = var.kubeconfig

setup/terraform/variables.tf

@@ -11,15 +11,9 @@ variable "agent_id" {
 }
 
 variable "kubeconfig" {
-  description = "Kubeconfig used by terraform"
+  description = "Kubeconfig used by the Humanitec Agent / terraform"
   type        = string
-  default     = "../../kube/config.yaml"
-}
-
-variable "agent_kubeconfig" {
-  description = "Kubeconfig used by the Humanitec Agent"
-  type        = string
-  default     = "../../kube/config-internal.yaml"
+  default     = "/state/kube/config-internal.yaml"
 }
 
 resource "tls_private_key" "agent_private_key" {