Skip to content

Commit f545f38

Browse files
MaximilianoUribeMaximilianoUribe
authored
Merge branch 'main' into muribefalcon/adding-runner
2 parents ae68edc + 2eee84b commit f545f38

194 files changed

Lines changed: 13368 additions & 1974 deletions

File tree

Some content is hidden

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

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.11-bookworm@sha256:ae3aad004e1edc511c854faa568cee928feb0f6ebfe339d0042ef9bd4dc64f62
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.25-bookworm@sha256:7f31d02dec6d256dfcfa0c7fcc54f1002f8a0c71d6a6a60740e193abce6a1181
22

33
# [Optional] Uncomment this section to install additional OS packages.
44
# graphviz for pprof

‎.devcontainer/claude-code-copilot-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.11-bookworm@sha256:ae3aad004e1edc511c854faa568cee928feb0f6ebfe339d0042ef9bd4dc64f62
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.25-bookworm@sha256:7f31d02dec6d256dfcfa0c7fcc54f1002f8a0c71d6a6a60740e193abce6a1181
22

33
# [Optional] Uncomment this section to install additional OS packages.
44
# graphviz for pprof

‎.devcontainer/claude-code-copilot-api/devcontainer.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"dockerfile": "Dockerfile"
77
},
88
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
9+
"containerEnv": {
10+
// Workaround for "client version X is too new. Maximum supported API version is 1.43"
11+
"DOCKER_API_VERSION": "1.43"
12+
},
913

1014
// Configure tool-specific properties.
1115
"customizations": {

‎.devcontainer/devcontainer.json‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"dockerfile": "Dockerfile"
77
},
88
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
9+
"containerEnv": {
10+
// Workaround for "client version X is too new. Maximum supported API version is 1.43"
11+
"DOCKER_API_VERSION": "1.43"
12+
},
913

1014
// Configure tool-specific properties.
1115
"customizations": {
@@ -15,7 +19,12 @@
1519
"settings": {
1620
"go.toolsManagement.checkForUpdates": "local",
1721
"go.useLanguageServer": true,
18-
"go.gopath": "/go"
22+
"go.gopath": "/go",
23+
"github.copilot.chat.githubMcpServer.enabled": true,
24+
"github.copilot.chat.githubMcpServer.toolsets": [
25+
"default", // https://github.com/github/github-mcp-server/blob/main/README.md#default-toolset
26+
"actions"
27+
]
1928
},
2029

2130
// Add the IDs of extensions you want installed when the container is created.
@@ -30,8 +39,21 @@
3039
"GitHub.vscode-pull-request-github",
3140
"jinliming2.vscode-go-template",
3241
"tekumara.typos-vscode",
33-
"github.vscode-github-actions"
34-
]
42+
"github.vscode-github-actions",
43+
"GitHub.copilot-chat",
44+
"ms-azuretools.vscode-azure-github-copilot" // also adds MCP server and Azure resources
45+
],
46+
"mcp": {
47+
"servers": {
48+
// Azure MCP server - installed via extension
49+
// GitHub MCP server - via GitHub Copilot Chat built-in
50+
"deepwiki": {
51+
"type": "http",
52+
"url": "https://mcp.deepwiki.com/mcp"
53+
}
54+
// codewiki.google does not have MCP server, can just use web access
55+
}
56+
}
3557
}
3658
},
3759

@@ -61,7 +83,7 @@
6183
"version": "none"
6284
},
6385
"ghcr.io/devcontainers/features/node:1": {
64-
"version": "none"
86+
"version": "latest" // mostly for MCP servers
6587
},
6688
"ghcr.io/devcontainers/features/git:1": {
6789
"version": "latest",
@@ -74,6 +96,9 @@
7496
"ghcr.io/devcontainers/features/azure-cli:1": {},
7597
"ghcr.io/devcontainers-extra/features/pre-commit:2": {},
7698
"ghcr.io/CargoSense/devcontainer-features/shellcheck:1": {},
77-
"ghcr.io/rio/features/skaffold:2": { "version": "v2.14.2" }
99+
"ghcr.io/rio/features/skaffold:2": { "version": "v2.14.2" },
100+
// agent tools
101+
"ghcr.io/devcontainers-extra/features/ripgrep:1": {},
102+
"ghcr.io/devcontainers/features/github-cli:1": {}
78103
}
79104
}

‎.github/actions/e2e/cleanup/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ inputs:
2828
runs:
2929
using: "composite"
3030
steps:
31-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
with:
3333
ref: ${{ inputs.git_ref }}
3434
- name: az login

‎.github/actions/e2e/create-acr/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ inputs:
2525
runs:
2626
using: "composite"
2727
steps:
28-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
with:
3030
ref: ${{ inputs.git_ref }}
3131
- name: az login

‎.github/actions/e2e/create-cluster/action.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name: CreateCluster
22
description: 'Installs Go Downloads and installs Karpenter Dependencies'
33
inputs:
4-
# k8s_version:
5-
# description: 'Version of Kubernetes to use for the launched cluster'
6-
# required: false
7-
# default: "1.27"
4+
k8s_version:
5+
description: "Version of Kubernetes to use for the launched cluster (e.g., 1.30). If empty, uses AKS default."
6+
required: false
87
client-id:
98
description: "ID of the client to create the cluster with"
109
required: true
@@ -32,7 +31,7 @@ inputs:
3231
runs:
3332
using: "composite"
3433
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
34+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3635
with:
3736
ref: ${{ inputs.git_ref }}
3837
- name: az login
@@ -60,6 +59,7 @@ runs:
6059
AZURE_ACR_NAME: ${{ inputs.acr_name }}
6160
AZURE_LOCATION: ${{ inputs.location }}
6261
AZURE_VM_SIZE: Standard_D4ds_v5 # We have more quota for this VM size so force it to avoid quota errors
62+
K8S_VERSION: ${{ inputs.k8s_version }}
6363
run: make az-mkaks-cilium
6464
- name: az login 2
6565
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0

‎.github/actions/e2e/dump-logs/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ inputs:
2222
runs:
2323
using: "composite"
2424
steps:
25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
ref: ${{ inputs.git_ref }}
2828
- name: az login

‎.github/actions/e2e/install-karpenter/action.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ inputs:
3434
runs:
3535
using: "composite"
3636
steps:
37-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
37+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838
with:
3939
ref: ${{ inputs.git_ref }}
4040
- name: az login
@@ -55,7 +55,12 @@ runs:
5555
AZURE_CLUSTER_NAME: ${{ inputs.cluster_name }}
5656
AZURE_LOCATION: ${{ inputs.location }}
5757
PROVISION_MODE: ${{ inputs.provisionmode }}
58-
run: make az-configure-values
58+
run: |
59+
if [ "$PROVISION_MODE" = "aksmachineapi" ]; then
60+
make az-configure-values-aksmachine
61+
else
62+
make az-configure-values
63+
fi
5964
- name: deploy karpenter to cluster
6065
shell: bash
6166
env:

‎.github/actions/install-deps/action.yaml‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ inputs:
77
runs:
88
using: "composite"
99
steps:
10-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
10+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
1111
id: setup-go
1212
with:
1313
go-version-file: go.mod
@@ -16,16 +16,48 @@ runs:
1616
# Root path permission workaround for caching https://github.com/actions/cache/issues/845#issuecomment-1252594999
1717
- run: sudo chown "$USER" /usr/local
1818
shell: bash
19-
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
19+
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2020
id: cache-toolchain
2121
with:
2222
path: |
2323
/usr/local/kubebuilder/bin
2424
~/go/bin
25-
/usr/bin/trivy
26-
key: ${{ runner.os }}-${{ inputs.k8sVersion }}-toolchain-cache-${{ hashFiles('hack/toolchain.sh') }}
25+
# Include runner.environment in key because ~/go/bin expands differently on github-hosted vs self-hosted runners
26+
key: ${{ runner.os }}-${{ runner.environment }}-${{ inputs.k8sVersion }}-toolchain-cache-${{ hashFiles('hack/toolchain.sh') }}
2727
- if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' }}
2828
shell: bash
2929
env:
3030
K8S_VERSION: ${{ inputs.k8sVersion }}
3131
run: make toolchain
32+
# Install trivy separately since apt installs to /usr/bin which isn't cacheable
33+
- shell: bash
34+
run: |
35+
if ! command -v trivy &> /dev/null; then
36+
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
37+
echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
38+
sudo apt-get update
39+
sudo apt-get install -y trivy
40+
fi
41+
# Install CGO cross-compilers for multi-arch builds (apt installs to /usr which isn't cacheable)
42+
- shell: bash
43+
run: |
44+
if ! command -v aarch64-linux-gnu-gcc &> /dev/null || ! command -v x86_64-linux-gnu-gcc &> /dev/null; then
45+
sudo apt-get update
46+
sudo apt-get install -y gcc-aarch64-linux-gnu gcc-x86-64-linux-gnu
47+
fi
48+
# Log environment setup (useful for debugging)
49+
- shell: bash
50+
run: |
51+
echo "=== Environment ==="
52+
echo "HOME: $HOME"
53+
echo "GOPATH: $(go env GOPATH)"
54+
echo "PATH: $PATH"
55+
echo ""
56+
echo "=== Contents of $HOME/go/bin ==="
57+
ls -la "$HOME/go/bin" || echo "$HOME/go/bin does not exist"
58+
echo ""
59+
echo "=== Contents of \$(go env GOPATH)/bin ==="
60+
ls -la "$(go env GOPATH)/bin" || echo "\$(go env GOPATH)/bin does not exist"
61+
echo ""
62+
echo "=== Go version ==="
63+
go version

0 commit comments

Comments
 (0)