Skip to content

Commit 9c1e283

Browse files
wallyworldwallyworld
committed
Merge branch '3.4' into merge-3.4-20240102
2 parents 7c5152a + 985d5a5 commit 9c1e283

File tree

2,011 files changed

+12635
-7849
lines changed

Some content is hidden

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

2,011 files changed

+12635
-7849
lines changed

‎.github/api-client-allowed-list.txt

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
archive
2+
bufio
3+
bytes
4+
compress
5+
compress
6+
container
7+
context
8+
crypto
9+
database/sql/driver
10+
embed
11+
encoding
12+
encoding
13+
errors
14+
fmt
15+
github.com/canonical/lxd/shared/api
16+
github.com/distribution/reference
17+
github.com/docker/distribution
18+
github.com/go-macaroon-bakery/macaroon-bakery/v3
19+
github.com/go-macaroon-bakery/macaroonpb
20+
github.com/gobwas/glob
21+
github.com/golang/protobuf/proto
22+
github.com/gorilla/websocket
23+
github.com/juju/
24+
github.com/julienschmidt/httprouter
25+
github.com/kr/pretty
26+
github.com/kr/text
27+
github.com/lunixbochs/vtclean
28+
github.com/mattn/go-colorable
29+
github.com/mattn/go-isatty
30+
github.com/mohae/deepcopy
31+
github.com/opencontainers/go-digest
32+
github.com/rogpeppe/fastuuid
33+
github.com/rogpeppe/go-internal/fmtsort
34+
github.com/rs/xid
35+
github.com/vishvananda/netlink
36+
github.com/vishvananda/netns
37+
github.com/xdg-go/stringprep
38+
go
39+
golang.org/x
40+
google.golang.org/protobuf
41+
gopkg.in/errgo.v1
42+
gopkg.in/gobwas/glob.v0
43+
gopkg.in/httprequest.v1
44+
gopkg.in/macaroon.v2
45+
gopkg.in/yaml.v2
46+
hash
47+
internal
48+
io
49+
log
50+
math
51+
mime
52+
net
53+
os
54+
path
55+
reflect
56+
regexp
57+
runtime
58+
sort
59+
strconv
60+
strings
61+
sync
62+
syscall
63+
text
64+
time
65+
unicode
66+
unsafe
67+
vendor/golang.org/x

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/checkout@v3
3939

4040
- name: "Set up Go"
41-
uses: actions/setup-go@v4
41+
uses: actions/setup-go@v5
4242
with:
4343
go-version-file: 'go.mod'
4444
cache: true

‎.github/workflows/client-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@v3
3333

3434
- name: "Set up Go"
35-
uses: actions/setup-go@v4
35+
uses: actions/setup-go@v5
3636
with:
3737
go-version-file: 'go.mod'
3838
cache: true

‎.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v3
2121

2222
- name: Set up Go
23-
uses: actions/setup-go@v4
23+
uses: actions/setup-go@v5
2424
with:
2525
go-version-file: 'go.mod'
2626
cache: true

‎.github/workflows/gen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v3
2727

2828
- name: "Set up Go"
29-
uses: actions/setup-go@v4
29+
uses: actions/setup-go@v5
3030
with:
3131
go-version-file: 'go.mod'
3232
cache: true

‎.github/workflows/license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Checkout
2323
uses: actions/checkout@v3
2424
- name: Set up Go
25-
uses: actions/setup-go@v4
25+
uses: actions/setup-go@v5
2626
with:
2727
go-version-file: 'go.mod'
2828
cache: true

‎.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
ref: ${{ steps.branch.outputs.source }}
3232

3333
- name: Set up Go
34-
uses: actions/setup-go@v4
34+
uses: actions/setup-go@v5
3535
with:
3636
go-version-file: 'go.mod'
3737
cache: false

‎.github/workflows/microk8s-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v3
2727

2828
- name: Set up Go
29-
uses: actions/setup-go@v4
29+
uses: actions/setup-go@v5
3030
with:
3131
go-version-file: 'go.mod'
3232
cache: true
@@ -131,7 +131,7 @@ jobs:
131131
if: ${{ failure() }}
132132

133133
- name: Upload debug log
134-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v2
134+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v2
135135
with:
136136
name: juju-debug-actions
137137
path: juju-debug.log
@@ -159,7 +159,7 @@ jobs:
159159
if: ${{ failure() }}
160160

161161
- name: Upload inspect tarball
162-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v2
162+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v2
163163
with:
164164
name: inspection-report-actions
165165
path: ./inspection-report-${{ strategy.job-index }}.tar.gz
@@ -175,7 +175,7 @@ jobs:
175175
if: ${{ failure() }}
176176

177177
- name: Upload kubectl describe
178-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v2
178+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v2
179179
with:
180180
name: kubectl-describe-actions
181181
path: describe/*.describe
@@ -193,7 +193,7 @@ jobs:
193193
if: ${{ failure() }}
194194

195195
- name: Upload kubeflow pod logs
196-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v2
196+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v2
197197
with:
198198
name: kubectl-stdout-actions
199199
path: stdout/*.log

‎.github/workflows/migrate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@v3
3636

3737
- name: Set up Go
38-
uses: actions/setup-go@v4
38+
uses: actions/setup-go@v5
3939
with:
4040
go-version-file: 'go.mod'
4141
cache: true

‎.github/workflows/smoke.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
launch-configuration: "$GITHUB_WORKSPACE/.github/microk8s-launch-config-aws.yaml"
5353

5454
- name: Set up Go
55-
uses: actions/setup-go@v4
55+
uses: actions/setup-go@v5
5656
with:
5757
go-version-file: 'go.mod'
5858
cache: true

‎.github/workflows/snap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Set up Go
4242
if: env.RUN_TEST == 'RUN'
43-
uses: actions/setup-go@v4
43+
uses: actions/setup-go@v5
4444
with:
4545
go-version-file: 'go.mod'
4646
cache: true

‎.github/workflows/static-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- 'tests/suites/static_analysis/**'
4141
4242
- name: Set up Go
43-
uses: actions/setup-go@v4
43+
uses: actions/setup-go@v5
4444
with:
4545
go-version-file: 'go.mod'
4646
cache: true
@@ -121,7 +121,7 @@ jobs:
121121
122122
- name: Set up Go
123123
if: steps.filter.outputs.schema == 'true'
124-
uses: actions/setup-go@v4
124+
uses: actions/setup-go@v5
125125
with:
126126
go-version-file: 'go.mod'
127127
cache: true

‎.github/workflows/update-brew-formulae.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Update Homebrew formulae
20-
uses: dawidd6/action-homebrew-bump-formula@d3667e5ae14df19579e4414897498e3e88f2f458 # master
20+
uses: dawidd6/action-homebrew-bump-formula@75ed025ff3ad1d617862838b342b06d613a0ddf3 # master
2121
with:
2222
token: "${{ secrets.TOKEN }}"
2323
formula: juju

‎.github/workflows/upgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Set up Go
7676
if: env.RUN_TEST == 'RUN'
77-
uses: actions/setup-go@v4
77+
uses: actions/setup-go@v5
7878
with:
7979
go-version-file: 'go.mod'
8080
cache: true

‎acceptancetests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ pyaml>=17.12.1
4444
dnspython==1.16.0
4545
google-api-python-client==1.7.8
4646
google-cloud-container==0.2.1
47-
cryptography==41.0.4
47+
cryptography==41.0.6
4848
six>=1.15.0

‎agent/addons/addons.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/juju/clock"
1010
"github.com/juju/errors"
11-
"github.com/juju/names/v4"
11+
"github.com/juju/names/v5"
1212
"github.com/juju/worker/v3"
1313
"github.com/juju/worker/v3/dependency"
1414
"github.com/prometheus/client_golang/prometheus"

‎agent/addons/addons_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/juju/clock"
1111
"github.com/juju/errors"
1212
"github.com/juju/loggo"
13-
"github.com/juju/names/v4"
13+
"github.com/juju/names/v5"
1414
"github.com/juju/testing"
1515
jc "github.com/juju/testing/checkers"
1616
"github.com/juju/worker/v3"

‎agent/addons/engine_mock_test.go

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

‎agent/addons/prometheus_mock_test.go

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

‎agent/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/juju/collections/set"
1818
"github.com/juju/errors"
1919
"github.com/juju/loggo"
20-
"github.com/juju/names/v4"
20+
"github.com/juju/names/v5"
2121
"github.com/juju/utils/v3"
2222
"github.com/juju/utils/v3/shell"
2323
"github.com/juju/version/v2"

‎agent/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/juju/errors"
13-
"github.com/juju/names/v4"
13+
"github.com/juju/names/v5"
1414
jc "github.com/juju/testing/checkers"
1515
"github.com/juju/version/v2"
1616
gc "gopkg.in/check.v1"

‎agent/agentbootstrap/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/juju/errors"
1212
"github.com/juju/loggo"
1313
"github.com/juju/mgo/v3"
14-
"github.com/juju/names/v4"
14+
"github.com/juju/names/v5"
1515
utilseries "github.com/juju/os/v2/series"
1616
"github.com/juju/utils/v3"
1717

‎agent/agentbootstrap/bootstrap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/juju/errors"
1010
mgotesting "github.com/juju/mgo/v3/testing"
11-
"github.com/juju/names/v4"
11+
"github.com/juju/names/v5"
1212
jujutesting "github.com/juju/testing"
1313
jc "github.com/juju/testing/checkers"
1414
"github.com/juju/utils/v3"

‎agent/config/agentconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88

99
"github.com/juju/errors"
10-
"github.com/juju/names/v4"
10+
"github.com/juju/names/v5"
1111

1212
"github.com/juju/juju/agent"
1313
)

‎agent/engine/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package engine
55

66
import (
7-
"github.com/juju/names/v4"
7+
"github.com/juju/names/v5"
88
"github.com/juju/worker/v3/dependency"
99
"github.com/prometheus/client_golang/prometheus"
1010
)

‎agent/format-2.0.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/juju/errors"
13-
"github.com/juju/names/v4"
13+
"github.com/juju/names/v5"
1414
"github.com/juju/version/v2"
1515
goyaml "gopkg.in/yaml.v2"
1616

‎agent/format_whitebox_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path/filepath"
1010
"runtime"
1111

12-
"github.com/juju/names/v4"
12+
"github.com/juju/names/v5"
1313
jc "github.com/juju/testing/checkers"
1414
gc "gopkg.in/check.v1"
1515

0 commit comments

Comments
 (0)