Skip to content

Commit

Permalink
chore(dev): update tools and helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
omissis committed Jul 6, 2023
1 parent 1be834f commit cd00708
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ tilt_config.json
tilt_modules
node_modules
kubeconfig
coverage.out
16 changes: 8 additions & 8 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ctlptl 0.8.18
golang 1.20.3
golangci-lint 1.52.2
helm 3.11.3
ctlptl 0.8.20
golang 1.20.5
golangci-lint 1.53.2
helm 3.12.1
jq 1.6
kind 0.18.0
kubectl 1.27.1
kind 0.20.0
kubectl 1.27.3
make 4.4.1
mkcert 1.4.4
nodejs 20.0.0
shellcheck 0.9.0
tilt 0.32.3
tilt 0.33.1
yamllint 1.30.0
yq 4.33.3
yq 4.34.1
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ COPY go.sum go.sum
RUN go mod download

COPY internal internal
COPY pkg pkg
COPY main.go main.go

ENTRYPOINT [ "go", "run", "main.go" ]
Expand Down
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,6 @@ format-json:
format-json-docker: docker-tools
$(call run-script-docker,${_DOCKER_TOOLS_IMAGE},format-json)

# ----------------------------------------------------------------------------------------------------------------------
# GraphQL Targets
# ----------------------------------------------------------------------------------------------------------------------

.PHONY: generate-graphql generate-graphql-docker

generate-graphql:
@scripts/generate-graphql.sh

# TODO: implement docker image for this target
# generate-graphql-docker:
# $(call run-script-docker,${_DOCKER_GRAPHQL_IMAGE},generate-graphql)

# ----------------------------------------------------------------------------------------------------------------------
# Golang Targets
# ----------------------------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ docker_build_with_restart(
target="dev",
live_update=[
sync("./internal", "/app/internal"),
sync("./pkg", "/app/pkg"),
sync("./go.mod", "/app/go.mod"),
sync("./go.sum", "/app/go.sum"),
sync("./gqlgen.yml", "/app/gqlgen.yml"),
sync("./main.go", "/app/main.go"),
],
build_args={},
Expand All @@ -30,7 +30,7 @@ helm_resource(
'./deployments/helm/kube-apiserver-proxy',
release_name='kube-apiserver-proxy',
namespace='default',
flags=['--values', './deployments/values.dev.yaml'],
flags=['--values', './configs/helm-values/kube-apiserver-proxy.yaml'],
image_deps=['kube-apiserver-proxy'],
image_keys=[('image.repository', 'image.tag')],
)
Expand Down

0 comments on commit cd00708

Please sign in to comment.