Skip to content

Commit 02dc1ce

Browse files
committed
Merge remote-tracking branch 'origin/main' into copilot/fix-3711
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2 parents 8e784e2 + 35f2801 commit 02dc1ce

File tree

7 files changed

+149
-29
lines changed

7 files changed

+149
-29
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Copilot Setup Steps"
2+
3+
# Automatically run the setup steps when they are changed to allow for easy validation, and
4+
# allow manual testing through the repository's "Actions" tab
5+
on:
6+
workflow_dispatch:
7+
push:
8+
paths:
9+
- .github/workflows/copilot-setup-steps.yml
10+
pull_request:
11+
paths:
12+
- .github/workflows/copilot-setup-steps.yml
13+
14+
jobs:
15+
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
16+
copilot-setup-steps:
17+
runs-on: ubuntu-latest
18+
permissions:
19+
packages: read
20+
21+
steps:
22+
- name: Checkout code
23+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
24+
with:
25+
fetch-depth: 0 # required to access tags
26+
submodules: 'true'
27+
28+
- name: Install Dependencies
29+
run: sudo .devcontainer/install-dependencies.sh

v2/cmd/asoctl/go.mod

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ require (
2121
github.com/spf13/cobra v1.9.1
2222
github.com/vbauerster/mpb/v8 v8.10.2
2323
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
24-
k8s.io/api v0.33.2
25-
k8s.io/apiextensions-apiserver v0.33.2
26-
k8s.io/apimachinery v0.33.2
27-
k8s.io/client-go v0.33.2
24+
k8s.io/api v0.33.3
25+
k8s.io/apiextensions-apiserver v0.33.3
26+
k8s.io/apimachinery v0.33.3
27+
k8s.io/client-go v0.33.3
2828
sigs.k8s.io/controller-runtime v0.21.0
29-
sigs.k8s.io/yaml v1.5.0
29+
sigs.k8s.io/yaml v1.6.0
3030
)
3131

3232
require (
@@ -57,15 +57,21 @@ require (
5757
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
5858
github.com/Azure/msi-dataplane v0.4.3 // indirect
5959
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
60+
github.com/NYTimes/gziphandler v1.1.1 // indirect
6061
github.com/VividCortex/ewma v1.2.0 // indirect
6162
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
6263
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
6364
github.com/benbjohnson/clock v1.3.5 // indirect
6465
github.com/beorn7/perks v1.0.1 // indirect
66+
github.com/blang/semver/v4 v4.0.0 // indirect
67+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6568
github.com/cespare/xxhash/v2 v2.3.0 // indirect
69+
github.com/coreos/go-semver v0.3.1 // indirect
70+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6671
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6772
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
6873
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
74+
github.com/felixge/httpsnoop v1.0.4 // indirect
6975
github.com/fsnotify/fsnotify v1.8.0 // indirect
7076
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7177
github.com/go-logr/stdr v1.2.2 // indirect
@@ -77,11 +83,15 @@ require (
7783
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
7884
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
7985
github.com/golang-sql/sqlexp v0.1.0 // indirect
86+
github.com/golang/protobuf v1.5.4 // indirect
8087
github.com/google/btree v1.1.3 // indirect
8188
github.com/google/cel-go v0.26.0 // indirect
8289
github.com/google/gnostic-models v0.6.9 // indirect
8390
github.com/google/go-cmp v0.7.0 // indirect
8491
github.com/google/uuid v1.6.0 // indirect
92+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
93+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
94+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
8595
github.com/hbollon/go-edlib v1.6.0 // indirect
8696
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8797
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -106,9 +116,11 @@ require (
106116
github.com/microsoft/kiota-serialization-text-go v1.1.2 // indirect
107117
github.com/microsoftgraph/msgraph-sdk-go v1.78.0 // indirect
108118
github.com/microsoftgraph/msgraph-sdk-go-core v1.3.2 // indirect
119+
github.com/moby/spdystream v0.5.0 // indirect
109120
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
110121
github.com/modern-go/reflect2 v1.0.2 // indirect
111122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
123+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
112124
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
113125
github.com/pkg/errors v0.9.1 // indirect
114126
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -123,10 +135,21 @@ require (
123135
github.com/stoewer/go-strcase v1.3.0 // indirect
124136
github.com/stretchr/testify v1.10.0 // indirect
125137
github.com/x448/float16 v0.8.4 // indirect
138+
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
139+
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
140+
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
126141
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
142+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
143+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
127144
go.opentelemetry.io/otel v1.35.0 // indirect
145+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
146+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
128147
go.opentelemetry.io/otel/metric v1.35.0 // indirect
148+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
129149
go.opentelemetry.io/otel/trace v1.35.0 // indirect
150+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
151+
go.uber.org/multierr v1.11.0 // indirect
152+
go.uber.org/zap v1.27.0 // indirect
130153
go.yaml.in/yaml/v2 v2.4.2 // indirect
131154
golang.org/x/crypto v0.40.0 // indirect
132155
golang.org/x/net v0.42.0 // indirect
@@ -139,13 +162,19 @@ require (
139162
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
140163
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
141164
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
165+
google.golang.org/grpc v1.71.0 // indirect
142166
google.golang.org/protobuf v1.36.6 // indirect
143167
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
144168
gopkg.in/inf.v0 v0.9.1 // indirect
169+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
145170
gopkg.in/yaml.v3 v3.0.1 // indirect
171+
k8s.io/apiserver v0.33.3 // indirect
172+
k8s.io/component-base v0.33.3 // indirect
146173
k8s.io/klog/v2 v2.130.1 // indirect
174+
k8s.io/kms v0.33.3 // indirect
147175
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
148176
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
177+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0 // indirect
149178
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
150179
sigs.k8s.io/randfill v1.0.0 // indirect
151180
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect

0 commit comments

Comments
 (0)