Skip to content

Commit 6ee389c

Browse files
authored
Merge branch 'master' into release/1.9
2 parents a87d836 + 7e66fcf commit 6ee389c

File tree

6 files changed

+275
-175
lines changed

6 files changed

+275
-175
lines changed

CHANGELOG/CHANGELOG-1.7.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
- [How to try](#how-to-try)
2-
- [v1.7.0-rc1](#v170-rc1)
2+
- [v1.7.0](#v170)
33
- [Features](#features)
44
- [Fixes](#fixes)
55

6-
# v1.7.0-rc1
6+
# v1.7.0
77

88
## Features
99
* [#1498](https://github.com/Azure/application-gateway-kubernetes-ingress/pull/1498) Support for Workload Identity in AGIC Helm installation
@@ -25,9 +25,9 @@ helm install \
2525
<release-name> \
2626
-f helm-config.yaml \
2727
application-gateway-kubernetes-ingress/ingress-azure \
28-
--version 1.7.0-rc1
28+
--version 1.7.0
2929

30-
# or
30+
# or
3131

3232
# Upgrade
3333
# https://github.com/Azure/application-gateway-kubernetes-ingress/blob/master/docs/how-tos/helm-upgrade.md
@@ -40,6 +40,6 @@ helm upgrade \
4040
<release-name> \
4141
application-gateway-kubernetes-ingress/ingress-azure \
4242
--reuse-values
43-
--version 1.7.0-rc1
43+
--version 1.7.0
4444
```
4545

CHANGELOG/CHANGELOG-1.8.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
- [How to try](#how-to-try)
2+
- [v1.8.1](#v181)
3+
- [Features](#features)
4+
- [Fixes](#fixes)
5+
6+
# v1.8.1
7+
8+
## Fixes
9+
* [#1708](https://github.com/Azure/application-gateway-kubernetes-ingress/pull/1708) Bumped go dependency versions
10+
* [#1707](https://github.com/Azure/application-gateway-kubernetes-ingress/pull/1707) Fixed Overlay CNI label checking
11+
12+
# v1.8.0
13+
14+
## Features
15+
* [#1650](https://github.com/Azure/application-gateway-kubernetes-ingress/pull/1650) Support for Overlay CNI
16+
17+
## How to try:
18+
```bash
19+
# Add helm repo / update AGIC repo
20+
helm repo add application-gateway-kubernetes-ingress https://appgwingress.blob.core.windows.net/ingress-azure-helm-package/
21+
helm repo update
22+
23+
# Install
24+
helm install \
25+
<release-name> \
26+
-f helm-config.yaml \
27+
application-gateway-kubernetes-ingress/ingress-azure \
28+
--version 1.8.1
29+
30+
# or
31+
32+
# Upgrade
33+
# https://github.com/Azure/application-gateway-kubernetes-ingress/blob/master/docs/how-tos/helm-upgrade.md
34+
# --reuse-values when upgrading, reuse the last release's values and merge in any overrides from the command line via --set and -f. If '--reset-values' is specified, this is ignored
35+
36+
# Install CRDs separately as helm upgrade doesn't install CRDs.
37+
kubectl apply -f https://raw.githubusercontent.com/Azure/application-gateway-kubernetes-ingress/master/helm/ingress-azure/crds/azureapplicationgatewayrewrite.yaml
38+
39+
helm upgrade \
40+
<release-name> \
41+
application-gateway-kubernetes-ingress/ingress-azure \
42+
--reuse-values
43+
--version 1.8.1
44+
```

go.mod

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/Azure/application-gateway-kubernetes-ingress
22

3-
go 1.23.0
3+
go 1.23.2
44

5-
toolchain go1.23.3
5+
toolchain go1.24.3
66

77
require (
8-
github.com/Azure/azure-container-networking v1.6.19
8+
github.com/Azure/azure-container-networking v1.6.25
99
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible
10-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
11-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
12-
github.com/Azure/go-autorest/autorest v0.11.29
10+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
11+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
12+
github.com/Azure/go-autorest/autorest v0.11.30
1313
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13
1414
github.com/Azure/go-autorest/autorest/to v0.4.0
1515
github.com/deckarep/golang-set v1.8.0
@@ -20,8 +20,8 @@ require (
2020
github.com/onsi/ginkgo/v2 v2.22.2
2121
github.com/onsi/gomega v1.36.2
2222
github.com/pkg/errors v0.9.1
23-
github.com/prometheus/client_golang v1.20.5
24-
github.com/spf13/pflag v1.0.5
23+
github.com/prometheus/client_golang v1.22.0
24+
github.com/spf13/pflag v1.0.6
2525
gopkg.in/yaml.v2 v2.4.0
2626
k8s.io/api v0.32.1
2727
k8s.io/apimachinery v0.32.1
@@ -33,65 +33,63 @@ require (
3333
replace (
3434
github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
3535
github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2
36-
golang.org/x/crypto => golang.org/x/crypto v0.31.0
3736
golang.org/x/net => golang.org/x/net v0.38.0
3837
)
3938

4039
require (
41-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
40+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
4241
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
43-
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
42+
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
4443
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
45-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
44+
github.com/Azure/go-autorest/autorest/date v0.3.1 // indirect
4645
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
47-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
48-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
49-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
46+
github.com/Azure/go-autorest/logger v0.2.2 // indirect
47+
github.com/Azure/go-autorest/tracing v0.6.1 // indirect
48+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
5049
github.com/beorn7/perks v1.0.1 // indirect
5150
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5251
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5352
github.com/dimchansky/utfbom v1.1.1 // indirect
54-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
53+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
5554
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
56-
github.com/fsnotify/fsnotify v1.8.0 // indirect
55+
github.com/fsnotify/fsnotify v1.9.0 // indirect
5756
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5857
github.com/go-logr/logr v1.4.2 // indirect
5958
github.com/go-openapi/jsonpointer v0.21.0 // indirect
60-
github.com/go-openapi/jsonreference v0.20.2 // indirect
59+
github.com/go-openapi/jsonreference v0.20.4 // indirect
6160
github.com/go-openapi/swag v0.23.0 // indirect
6261
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6362
github.com/gogo/protobuf v1.3.2 // indirect
6463
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
65-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
64+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
6665
github.com/golang/protobuf v1.5.4 // indirect
6766
github.com/google/gnostic-models v0.6.8 // indirect
68-
github.com/google/go-cmp v0.6.0 // indirect
67+
github.com/google/go-cmp v0.7.0 // indirect
6968
github.com/google/gofuzz v1.2.0 // indirect
7069
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
7170
github.com/google/uuid v1.6.0 // indirect
7271
github.com/josharian/intern v1.0.0 // indirect
7372
github.com/json-iterator/go v1.1.12 // indirect
74-
github.com/klauspost/compress v1.17.9 // indirect
7573
github.com/mailru/easyjson v0.7.7 // indirect
7674
github.com/mitchellh/go-homedir v1.1.0 // indirect
7775
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7876
github.com/modern-go/reflect2 v1.0.2 // indirect
7977
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8078
github.com/nxadm/tail v1.4.11 // indirect
8179
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
82-
github.com/prometheus/client_model v0.6.1 // indirect
83-
github.com/prometheus/common v0.61.0 // indirect
80+
github.com/prometheus/client_model v0.6.2 // indirect
81+
github.com/prometheus/common v0.63.0 // indirect
8482
github.com/prometheus/procfs v0.15.1 // indirect
8583
github.com/x448/float16 v0.8.4 // indirect
86-
golang.org/x/crypto v0.36.0 // indirect
87-
golang.org/x/net v0.34.0 // indirect
88-
golang.org/x/oauth2 v0.24.0 // indirect
89-
golang.org/x/sys v0.31.0 // indirect
90-
golang.org/x/term v0.30.0 // indirect
91-
golang.org/x/text v0.23.0 // indirect
92-
golang.org/x/time v0.8.0 // indirect
93-
golang.org/x/tools v0.28.0 // indirect
94-
google.golang.org/protobuf v1.36.1 // indirect
84+
golang.org/x/crypto v0.38.0 // indirect
85+
golang.org/x/net v0.40.0 // indirect
86+
golang.org/x/oauth2 v0.25.0 // indirect
87+
golang.org/x/sys v0.33.0 // indirect
88+
golang.org/x/term v0.32.0 // indirect
89+
golang.org/x/text v0.25.0 // indirect
90+
golang.org/x/time v0.11.0 // indirect
91+
golang.org/x/tools v0.33.0 // indirect
92+
google.golang.org/protobuf v1.36.6 // indirect
9593
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9694
gopkg.in/inf.v0 v0.9.1 // indirect
9795
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

0 commit comments

Comments
 (0)