Skip to content

Commit 81f5de4

Browse files
Merge branch 'kubernetes-sigs:main' into anp
2 parents 1db5111 + 346fb6a commit 81f5de4

File tree

129 files changed

+6895
-9124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+6895
-9124
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
backend/headlamp-server
22
backend/headlamp-server.exe
3+
backend/tmp
34
backend/tools
45
backend/coverage.out
56
app/electron/src/*

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ else
106106
@cmd /c "set HEADLAMP_BACKEND_TOKEN=headlamp&& set HEADLAMP_CONFIG_ENABLE_HELM=true&& set HEADLAMP_CONFIG_ENABLE_DYNAMIC_CLUSTERS=true&& backend\headlamp-server -dev -proxy-urls https://artifacthub.io/* -listen-addr=localhost"
107107
endif
108108

109+
run-dev:
110+
@echo "Starting Headlamp backend in dev mode with Air..."
111+
cd backend && air
112+
109113
run-backend-with-metrics:
110114
@echo "**** Running backend with Prometheus metrics enabled ****"
111115
ifeq ($(UNIXSHELL),true)

app/app-build-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"plugins": [
44
{
55
"name": "app-catalog",
6-
"archive": "https://github.com/headlamp-k8s/plugins/releases/download/app-catalog-0.6.1/app-catalog-0.6.1.tar.gz"
6+
"archive": "https://github.com/headlamp-k8s/plugins/releases/download/app-catalog-0.6.2/app-catalog-0.6.2.tar.gz"
77
},
88
{
99
"name": "plugin-catalog",

app/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "headlamp",
3-
"version": "0.32.0",
3+
"version": "0.33.0",
44
"description": "Easy-to-use and extensible Kubernetes web UI",
55
"main": "electron/main.js",
66
"homepage": "https://github.com/kubernetes-sigs/headlamp/#readme",

backend/.air.toml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
root = "."
2+
testdata_dir = "testdata"
3+
tmp_dir = "tmp"
4+
5+
[build]
6+
args_bin = ["-dev", "-proxy-urls", "https://artifacthub.io/*", "-listen-addr=localhost"]
7+
bin = "./tmp/main"
8+
cmd = "go build -o ./tmp/main ./cmd"
9+
delay = 1000
10+
exclude_dir = ["assets", "tmp", "vendor", "testdata"]
11+
exclude_file = []
12+
exclude_regex = ["_test.go"]
13+
exclude_unchanged = false
14+
follow_symlink = false
15+
full_bin = "HEADLAMP_BACKEND_TOKEN=headlamp HEADLAMP_CONFIG_ENABLE_HELM=true HEADLAMP_CONFIG_ENABLE_DYNAMIC_CLUSTERS=true ./tmp/main"
16+
include_dir = []
17+
include_ext = ["go", "tpl", "tmpl", "html"]
18+
include_file = []
19+
kill_delay = "0s"
20+
log = "build-errors.log"
21+
poll = false
22+
poll_interval = 0
23+
post_cmd = []
24+
pre_cmd = []
25+
rerun = false
26+
rerun_delay = 500
27+
send_interrupt = false
28+
stop_on_error = false
29+
30+
31+
[log]
32+
time = false
33+
34+
[color]
35+
app = ""
36+
build = "yellow"
37+
main = "magenta"
38+
runner = "green"
39+
watcher = "cyan"
40+
41+
[misc]
42+
clean_on_exit = true
43+

0 commit comments

Comments
 (0)