Skip to content

Commit 0f6071c

Browse files
RichardChen820RichardChen820
authored
Merge pull request #118 from Azure/release/v2.3.0
Release/v2.3.0
2 parents 157fb54 + dbff435 commit 0f6071c

15 files changed

+1660
-812
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0 as builder
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0 AS builder
33

44
ARG MODULE_VERSION
55
WORKDIR /workspace

‎api/v1/azureappconfigurationprovider_types.go‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ type ConfigurationGenerationParameters struct {
6464
// +kubebuilder:validation:Pattern=[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*
6565
// +kubebuilder:validation:MaxLength=253
6666
// +kubebuilder:validation:MinLength=1
67-
ConfigMapName string `json:"configMapName"`
68-
ConfigMapData *ConfigMapDataOptions `json:"configMapData,omitempty"`
67+
ConfigMapName string `json:"configMapName"`
68+
ConfigMapData *DataOptions `json:"configMapData,omitempty"`
6969
}
7070

7171
// AzureAppConfigurationKeyValueOptions defines the options of fetching key-values from AppConfiguration.
@@ -111,12 +111,12 @@ type Sentinel struct {
111111
Label *string `json:"label,omitempty"`
112112
}
113113

114-
// ConfigMapDataOptions defines the options of generating ConfigMap data
115-
type ConfigMapDataOptions struct {
114+
// DataOptions defines the options of generating data
115+
type DataOptions struct {
116116
// +kubebuilder:default="default"
117-
Type ConfigMapDataType `json:"type,omitempty"`
118-
Key string `json:"key,omitempty"`
119-
// The delimiter that is used to output the ConfigMap data in hierarchical format when the type is set to json or yaml.
117+
Type DataType `json:"type,omitempty"`
118+
Key string `json:"key,omitempty"`
119+
// The delimiter that is used to output the data in hierarchical format when the type is set to json or yaml.
120120
// +kubebuilder:validation:MaxLength=50
121121
// +kubebuilder:validation:MinLength=1
122122
Separator *string `json:"separator,omitempty"`
@@ -189,17 +189,18 @@ type SecretGenerationParameters struct {
189189
// +kubebuilder:validation:Pattern=[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*
190190
// +kubebuilder:validation:MaxLength=253
191191
// +kubebuilder:validation:MinLength=1
192-
SecretName string `json:"secretName"`
192+
SecretName string `json:"secretName"`
193+
SecretData *DataOptions `json:"secretData,omitempty"`
193194
}
194195

195196
// +kubebuilder:validation:Enum=default;json;yaml;properties
196-
type ConfigMapDataType string
197+
type DataType string
197198

198199
const (
199-
Default ConfigMapDataType = "default"
200-
Properties ConfigMapDataType = "properties"
201-
Yaml ConfigMapDataType = "yaml"
202-
Json ConfigMapDataType = "json"
200+
Default DataType = "default"
201+
Properties DataType = "properties"
202+
Yaml DataType = "yaml"
203+
Json DataType = "json"
203204
)
204205

205206
type AppConfigurationSyncPhase string

‎api/v1/zz_generated.deepcopy.go‎

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

‎config/crd/bases/azconfig.io_azureappconfigurationproviders.yaml‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,28 @@ spec:
268268
description: SecretGenerationParameters defines the name of target
269269
Secret
270270
properties:
271+
secretData:
272+
description: DataOptions defines the options of generating
273+
data
274+
properties:
275+
key:
276+
type: string
277+
separator:
278+
description: The delimiter that is used to output the
279+
data in hierarchical format when the type is set to
280+
json or yaml.
281+
maxLength: 50
282+
minLength: 1
283+
type: string
284+
type:
285+
default: default
286+
enum:
287+
- default
288+
- json
289+
- yaml
290+
- properties
291+
type: string
292+
type: object
271293
secretName:
272294
maxLength: 253
273295
minLength: 1
@@ -284,15 +306,13 @@ spec:
284306
target ConfigMap
285307
properties:
286308
configMapData:
287-
description: ConfigMapDataOptions defines the options of generating
288-
ConfigMap data
309+
description: DataOptions defines the options of generating data
289310
properties:
290311
key:
291312
type: string
292313
separator:
293-
description: The delimiter that is used to output the ConfigMap
294-
data in hierarchical format when the type is set to json
295-
or yaml.
314+
description: The delimiter that is used to output the data
315+
in hierarchical format when the type is set to json or yaml.
296316
maxLength: 50
297317
minLength: 1
298318
type: string

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/onsi/gomega v1.36.1
1010
golang.org/x/crypto v0.38.0
1111
golang.org/x/sync v0.14.0
12-
k8s.io/apimachinery v0.32.3
13-
k8s.io/client-go v0.32.3
12+
k8s.io/apimachinery v0.32.4
13+
k8s.io/client-go v0.32.4
1414
sigs.k8s.io/controller-runtime v0.20.4
1515
)
1616

@@ -36,13 +36,13 @@ require (
3636
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
3737
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3838
github.com/x448/float16 v0.8.4 // indirect
39-
golang.org/x/tools v0.32.0 // indirect
39+
golang.org/x/tools v0.33.0 // indirect
4040
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4141
sigs.k8s.io/randfill v1.0.0 // indirect
4242
)
4343

4444
require (
45-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
45+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0
4646
github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.2.0
4747
github.com/beorn7/perks v1.0.1 // indirect
4848
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -69,8 +69,8 @@ require (
6969
github.com/stretchr/testify v1.10.0
7070
go.uber.org/multierr v1.11.0 // indirect
7171
go.uber.org/zap v1.27.0 // indirect
72-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
73-
golang.org/x/net v0.39.0 // indirect
72+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
73+
golang.org/x/net v0.40.0 // indirect
7474
golang.org/x/oauth2 v0.29.0 // indirect
7575
golang.org/x/sys v0.33.0 // indirect
7676
golang.org/x/term v0.32.0 // indirect
@@ -81,7 +81,7 @@ require (
8181
gopkg.in/inf.v0 v0.9.1 // indirect
8282
gopkg.in/yaml.v2 v2.4.0
8383
gopkg.in/yaml.v3 v3.0.1
84-
k8s.io/api v0.32.3
84+
k8s.io/api v0.32.4
8585
k8s.io/apiextensions-apiserver v0.32.3 // indirect
8686
k8s.io/klog/v2 v2.130.1
8787
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
22
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
3-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0 h1:OVoM452qUFBrX+URdH3VpR299ma4kfom0yB0URYky9g=
4-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0/go.mod h1:kUjrAo8bgEwLeZ/CmHqNl3Z/kPm7y6FKfxxK0izYUg4=
3+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0 h1:j8BorDEigD8UFOSZQiSqAMOOleyQOOQPnUAwV+Ls1gA=
4+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
55
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
66
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
77
github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.2.0 h1:uU4FujKFQAz31AbWOO3INV9qfIanHeIUSsGhRlcJJmg=
@@ -114,8 +114,8 @@ github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA
114114
github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
115115
github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
116116
github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
117-
github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
118-
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
117+
github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI=
118+
github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
119119
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
120120
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
121121
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
@@ -140,8 +140,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
140140
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
141141
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
142142
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
143-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
144-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
143+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 h1:y5zboxd6LQAqYIhHnB48p0ByQ/GnQx2BE33L8BOHQkI=
144+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
145145
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
146146
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
147147
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -150,8 +150,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
150150
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
151151
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
152152
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
153-
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
154-
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
153+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
154+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
155155
golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
156156
golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
157157
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -183,8 +183,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
183183
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
184184
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
185185
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
186-
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
187-
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
186+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
187+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
188188
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
189189
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
190190
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -204,14 +204,14 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
204204
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
205205
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
206206
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
207-
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
208-
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
207+
k8s.io/api v0.32.4 h1:kw8Y/G8E7EpNy7gjB8gJZl3KJkNz8HM2YHrZPtAZsF4=
208+
k8s.io/api v0.32.4/go.mod h1:5MYFvLvweRhyKylM3Es/6uh/5hGp0dg82vP34KifX4g=
209209
k8s.io/apiextensions-apiserver v0.32.3 h1:4D8vy+9GWerlErCwVIbcQjsWunF9SUGNu7O7hiQTyPY=
210210
k8s.io/apiextensions-apiserver v0.32.3/go.mod h1:8YwcvVRMVzw0r1Stc7XfGAzB/SIVLunqApySV5V7Dss=
211-
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
212-
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
213-
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
214-
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
211+
k8s.io/apimachinery v0.32.4 h1:8EEksaxA7nd7xWJkkwLDN4SvWS5ot9g6Z/VZb3ju25I=
212+
k8s.io/apimachinery v0.32.4/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
213+
k8s.io/client-go v0.32.4 h1:zaGJS7xoYOYumoWIFXlcVrsiYioRPrXGO7dBfVC5R6M=
214+
k8s.io/client-go v0.32.4/go.mod h1:k0jftcyYnEtwlFW92xC7MTtFv5BNcZBr+zn9jPlT9Ic=
215215
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
216216
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
217217
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=

0 commit comments

Comments
 (0)