chore(dev): add dlv to kotsadm skaffold

replicatedhq · Nov 3, 2021 · 3143305 · 3143305
1 parent 78d83ea
commit 3143305
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,13 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Connect to KOTSADM",
+            "type": "go",
+            "request": "attach",
+            "mode": "remote",
+            "port": 40000,
+            "host": "127.0.0.1"
+        },
+    ]
+}
diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ mock:
 
 .PHONY: kotsadm
 kotsadm:
-	go build ${LDFLAGS} -o bin/kotsadm $(BUILDFLAGS) ./cmd/kotsadm
+	go build ${LDFLAGS} ${GCFLAGS} -o bin/kotsadm $(BUILDFLAGS) ./cmd/kotsadm
 
 .PHONY: build-ttl.sh
 build-ttl.sh:

diff --git a/Makefile.build b/Makefile.build
@@ -24,6 +24,7 @@ define GIT_SHA
 endef
 endif
 
+ifndef DEBUG_KOTSADM
 define LDFLAGS
 -ldflags "\
 	-s -w \
@@ -32,3 +33,15 @@ define LDFLAGS
 	-X ${VERSION_PACKAGE}.buildTime=${DATE} \
 "
 endef
+else
+define LDFLAGS
+-ldflags "\
+	-X ${VERSION_PACKAGE}.version=${VERSION} \
+	-X ${VERSION_PACKAGE}.gitSHA=${GIT_SHA} \
+	-X ${VERSION_PACKAGE}.buildTime=${DATE} \
+"
+endef
+define GCFLAGS
+-gcflags="all=-N -l"
+endef
+endif
diff --git a/hack/dev/Dockerfile.skaffold b/hack/dev/Dockerfile.skaffold
@@ -12,7 +12,8 @@ COPY web/webcontent.go ./web/webcontent.go
 COPY web/dist ./web/dist
 COPY kotskinds ./kotskinds
 
-RUN make kotsadm
+RUN go get github.com/go-delve/delve/cmd/dlv
+RUN DEBUG_KOTSADM="true" make kotsadm
 
 FROM debian:buster
 RUN apt-get update && apt-get install -y --no-install-recommends curl gnupg2 \
@@ -159,6 +160,11 @@ RUN cd /tmp && curl -fsSL -o s3cmd.tar.gz "${S3CMD_URL}" \
   && mv s3cmd-${S3CMD_VERSION}/S3 /usr/local/bin/S3 \
   && rm -rf s3cmd.tar.gz s3cmd.tar.gz.asc s3cmd-${S3CMD_VERSION}
 
+COPY --from=builder /go/bin/dlv .
 COPY --from=builder /go/src/github.com/replicatedhq/kots/bin/kotsadm .
 
-ENTRYPOINT ["/kotsadm", "api"]
+EXPOSE 40000
+
+# Should be entrypoint
+ENTRYPOINT [ "/dlv", "--listen=:40000", "--continue", "--headless=true", "--api-version=2", "--accept-multiclient", "exec"]
+CMD ["/kotsadm", "api"]
diff --git a/kustomize/overlays/dev/deployment.yaml b/kustomize/overlays/dev/deployment.yaml
@@ -23,6 +23,10 @@ spec:
               name: backup
             - name: kubelet-client-cert
               mountPath: /etc/kubernetes/pki/kubelet
+          ports:
+            - containerPort: 40000
+              name: dlv
+              protocol: TCP
           env:
             - name: DEX_PGPASSWORD
               valueFrom:

diff --git a/kustomize/overlays/dev/dlv-service.yaml b/kustomize/overlays/dev/dlv-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: kotsadm-dlv
+  labels:
+    app: kotsadm
+    debug: "true"
+spec:
+  type: ClusterIP
+  ports:
+  - name: dlv
+    port: 40000
+    targetPort: dlv
+  selector:
+    app: kotsadm
diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml
@@ -6,6 +6,7 @@ bases:
 resources:
   - ./dex-postgres-secret.yaml
   - ./configmap-init-dex-db.yaml
+  - ./dlv-service.yaml
 
 patches:
   - ./deployment.yaml

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -71,6 +71,10 @@ portForward:
     resourceName: kotsadm
     port: 3000
     localPort: 30000
+  - resourceType: service
+    resourceName: kotsadm-dlv
+    port: 40000
+    localPort: 40000
   - resourceType: service
     resourceName: kotsadm-postgres
     port: 5432