Merge pull request #169 from qclaogui:k3d-5.7.1

[bingo] Update k3d to 5.7.1

.bingo/Variables.mk

@@ -41,6 +41,12 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
 	@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.20.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.20.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
 
+K3D := $(GOBIN)/k3d-v5.7.1
+$(K3D): $(BINGO_DIR)/k3d.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/k3d-v5.7.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=k3d.mod -o=$(GOBIN)/k3d-v5.7.1 "github.com/k3d-io/k3d/v5"
+
 KUSTOMIZE := $(GOBIN)/kustomize-v5.4.1
 $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

.bingo/k3d.mod

@@ -0,0 +1,7 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.22.5
+
+replace k8s.io/kubelet => k8s.io/kubelet v0.30.2
+
+require github.com/k3d-io/k3d/v5 v5.7.1

.bingo/variables.env

@@ -16,6 +16,8 @@ JB="${GOBIN}/jb-v0.5.1"
 
 JSONNETFMT="${GOBIN}/jsonnetfmt-v0.20.0"
 
+K3D="${GOBIN}/k3d-v5.7.1"
+
 KUSTOMIZE="${GOBIN}/kustomize-v5.4.1"
 
 MIXTOOL="${GOBIN}/mixtool-v0.0.0-20240408085510-16dc166166d9"

Makefile

@@ -190,11 +190,11 @@ down-microservices-mode-profiles:
 
 
 .PHONY: cluster
-cluster: ## Create k3s cluster
-	k3d cluster create k3s-codelab --config kubernetes/k3d-k3s-config.yaml
+cluster: $(K3D) ## Create k3s cluster
+	$(K3D) cluster create k3s-codelab --config kubernetes/k3d-k3s-config.yaml
 
-clean: ## Clean cluster
-	k3d cluster delete k3s-codelab
+clean: $(K3D) ## Clean cluster
+	$(K3D) cluster delete k3s-codelab
 	@rm -rf bin dist .lgtmp .lgtmp.tar
 	@rm -rf kubernetes/common/*/charts/
 
@@ -276,7 +276,7 @@ deploy-gateway:
 	@kubectl rollout status -n gateway deployment/nginx --watch --timeout=600s
 
 .PHONY: deploy-grafana
-deploy-grafana: deploy-prometheus-operator-crds deploy-minio deploy-gateway
+deploy-grafana: deploy-minio deploy-gateway
 	$(info ******************** deploy grafana manifests ********************)
 	@kubectl apply -f kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
 delete-grafana:

README.md

@@ -234,7 +234,7 @@ Use "lgtmp [command] --help" for more information about a command.
 
 | Port-mapping | Component | Description |
 | --- | --- | --- |
-| `12345:12345`, `4317`, `4318`, `6831` | [Alloy][1] | Eexpose `12345` port so we can directly access `alloy` inside container |
+| `12345:12345`, `4317`, `4318`, `6831` | [Alloy][1] | Expose `12345` port so we can directly access `alloy` inside container |
 | `33100:3100` | [Loki][2] | Expose `33100` port so we can directly access `loki` inside container |
 | `3000:3000`, `6060` | [Grafana][3] | Expose `3000` port so we can directly access `grafana` inside container |
 | `33200:3200`, `4317`, `4318` | [Tempo][4] | Expose `33200` port so we can directly access `tempo` inside container |

kubernetes/k3d-k3s-config.yaml

@@ -16,6 +16,10 @@ ports:
 - port: 8443:443
   nodeFilters:
   - loadbalancer
+files:
+- description: 'Pre-installed prometheus operator crds'
+  source: common/prometheus-operator-crds/manifests/k8s-all-in-one.yaml
+  destination: k3s-manifests-custom/prometheus-operator-crds-k8s-all-in-one.yaml
 registries:
   create:
     name: k3d-reg-docker-io