Skip to content

Commit 53ed66f

Browse files
feiskyerfeiskyer
authored
Merge pull request #49 from Azure/rename-pkg
chore: rename internal package to pkg
2 parents cf17a63 + 502264a commit 53ed66f

27 files changed

+63
-63
lines changed

‎.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ jobs:
1717
uses: actions/checkout@v4.2.2
1818
with:
1919
fetch-depth: 0
20-
20+
2121
- name: Set up Go
2222
uses: actions/setup-go@v5
2323
with:
2424
go-version: '1.24'
2525
check-latest: true
2626
cache: true
27-
27+
2828
- name: Lint
2929
uses: golangci/golangci-lint-action@v8
3030
with:
3131
version: latest
3232
args: --timeout=5m
33-
33+
3434
test:
3535
name: Test
3636
runs-on: ubuntu-latest
@@ -39,27 +39,27 @@ jobs:
3939
uses: actions/checkout@v4.2.2
4040
with:
4141
fetch-depth: 0
42-
42+
4343
- name: Set up Go
4444
uses: actions/setup-go@v5
4545
with:
4646
go-version: '1.24'
4747
check-latest: true
4848
cache: true
49-
49+
5050
- name: Install dependencies
5151
run: go mod download
52-
52+
5353
- name: Run tests with coverage
5454
run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
5555
continue-on-error: true
56-
56+
5757
- name: Upload coverage to Codecov
5858
uses: codecov/codecov-action@v5
5959
with:
6060
file: ./coverage.txt
6161
fail_ci_if_error: false
62-
62+
6363
- name: Archive code coverage results
6464
uses: actions/upload-artifact@v4
6565
with:
@@ -76,21 +76,21 @@ jobs:
7676
uses: actions/checkout@v4.2.2
7777
with:
7878
fetch-depth: 0
79-
79+
8080
- name: Set up Go
8181
uses: actions/setup-go@v5
8282
with:
8383
go-version: '1.24'
8484
check-latest: true
8585
cache: true
86-
86+
8787
- name: Build binary
8888
run: |
89-
go build -v -ldflags="-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit=$(git rev-parse HEAD) -X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata=$(date +%Y%m%d)" -o mcp-kubernetes ./cmd/mcp-kubernetes
90-
89+
go build -v -ldflags="-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit=$(git rev-parse HEAD) -X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata=$(date +%Y%m%d)" -o mcp-kubernetes ./cmd/mcp-kubernetes
90+
9191
- name: Build Docker image
9292
run: docker build -t mcp-kubernetes:test --build-arg VERSION=$(git describe --tags --always --dirty | cut -c2-),GIT_COMMIT=$(git rev-parse HEAD),BUILD_DATE=$(date +%Y%m%d),GIT_TREE_STATE=$(if git diff --quiet; then echo "clean"; else echo "dirty"; fi) .
93-
93+
9494
- name: Check Docker image
9595
run: |
9696
docker images mcp-kubernetes:test
@@ -104,7 +104,7 @@ jobs:
104104
uses: actions/checkout@v4.2.2
105105
with:
106106
fetch-depth: 0
107-
107+
108108
- name: Run Gosec Security Scanner
109109
uses: securego/gosec@master
110110
with:

‎.slsa-goreleaser/darwin-amd64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ main: ./cmd/mcp-kubernetes
2323
# {{ .Arch }} will be replaced by goarch field in the config file.
2424
binary: mcp-kubernetes-{{ .Os }}-{{ .Arch }}
2525
ldflags:
26-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion={{ .Env.VERSION }}"
27-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit={{ .Env.COMMIT }}"
28-
- "-X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState={{ .Env.TREE_STATE }}"
26+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion={{ .Env.VERSION }}"
27+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit={{ .Env.COMMIT }}"
28+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState={{ .Env.TREE_STATE }}"

‎.slsa-goreleaser/darwin-arm64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ main: ./cmd/mcp-kubernetes
2323
# {{ .Arch }} will be replaced by goarch field in the config file.
2424
binary: mcp-kubernetes-{{ .Os }}-{{ .Arch }}
2525
ldflags:
26-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion={{ .Env.VERSION }}"
27-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit={{ .Env.COMMIT }}"
28-
- "-X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState={{ .Env.TREE_STATE }}"
26+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion={{ .Env.VERSION }}"
27+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit={{ .Env.COMMIT }}"
28+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState={{ .Env.TREE_STATE }}"

‎.slsa-goreleaser/linux-amd64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ main: ./cmd/mcp-kubernetes
2323
# {{ .Arch }} will be replaced by goarch field in the config file.
2424
binary: mcp-kubernetes-{{ .Os }}-{{ .Arch }}
2525
ldflags:
26-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion={{ .Env.VERSION }}"
27-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit={{ .Env.COMMIT }}"
28-
- "-X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState={{ .Env.TREE_STATE }}"
26+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion={{ .Env.VERSION }}"
27+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit={{ .Env.COMMIT }}"
28+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState={{ .Env.TREE_STATE }}"

‎.slsa-goreleaser/linux-arm64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ main: ./cmd/mcp-kubernetes
2323
# {{ .Arch }} will be replaced by goarch field in the config file.
2424
binary: mcp-kubernetes-{{ .Os }}-{{ .Arch }}
2525
ldflags:
26-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion={{ .Env.VERSION }}"
27-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit={{ .Env.COMMIT }}"
28-
- "-X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState={{ .Env.TREE_STATE }}"
26+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion={{ .Env.VERSION }}"
27+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit={{ .Env.COMMIT }}"
28+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
29+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState={{ .Env.TREE_STATE }}"

‎.slsa-goreleaser/windows-amd64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ main: ./cmd/mcp-kubernetes
2222
# {{ .Arch }} will be replaced by goarch field in the config file.
2323
binary: mcp-kubernetes-{{ .Os }}-{{ .Arch }}.exe
2424
ldflags:
25-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion={{ .Env.VERSION }}"
26-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit={{ .Env.COMMIT }}"
27-
- "-X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
28-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState={{ .Env.TREE_STATE }}"
25+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion={{ .Env.VERSION }}"
26+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit={{ .Env.COMMIT }}"
27+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
28+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState={{ .Env.TREE_STATE }}"

‎.slsa-goreleaser/windows-arm64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ main: ./cmd/mcp-kubernetes
2222
# {{ .Arch }} will be replaced by goarch field in the config file.
2323
binary: mcp-kubernetes-{{ .Os }}-{{ .Arch }}.exe
2424
ldflags:
25-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion={{ .Env.VERSION }}"
26-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitCommit={{ .Env.COMMIT }}"
27-
- "-X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
28-
- "-X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState={{ .Env.TREE_STATE }}"
25+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion={{ .Env.VERSION }}"
26+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit={{ .Env.COMMIT }}"
27+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata={{ .Env.COMMIT_DATE }}"
28+
- "-X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState={{ .Env.TREE_STATE }}"

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN go mod download
1717
COPY . .
1818

1919
# Build the application
20-
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-X github.com/Azure/mcp-kubernetes/internal/version.GitVersion=${VERSION} -X github.com/Azure/mcp-kubernetes/internal/version.GitCommit=${GIT_COMMIT} -X github.com/Azure/mcp-kubernetes/internal/version.BuildMetadata=${BUILD_DATE} -X github.com/Azure/mcp-kubernetes/internal/version.GitTreeState=${GIT_TREE_STATE}" -o mcp-kubernetes ./cmd/mcp-kubernetes
20+
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-X github.com/Azure/mcp-kubernetes/pkg/version.GitVersion=${VERSION} -X github.com/Azure/mcp-kubernetes/pkg/version.GitCommit=${GIT_COMMIT} -X github.com/Azure/mcp-kubernetes/pkg/version.BuildMetadata=${BUILD_DATE} -X github.com/Azure/mcp-kubernetes/pkg/version.GitTreeState=${GIT_TREE_STATE}" -o mcp-kubernetes ./cmd/mcp-kubernetes
2121

2222
# Runtime stage
2323
FROM alpine:3.19

‎cmd/mcp-kubernetes/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"log"
66
"os"
77

8-
"github.com/Azure/mcp-kubernetes/internal/config"
9-
"github.com/Azure/mcp-kubernetes/internal/server"
8+
"github.com/Azure/mcp-kubernetes/pkg/config"
9+
"github.com/Azure/mcp-kubernetes/pkg/server"
1010
)
1111

1212
func main() {

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/mcp-kubernetes
22

3-
go 1.23
3+
go 1.24
44

55
toolchain go1.24.2
66

0 commit comments

Comments
 (0)