Merge pull request #29 from Azure/release/v1

Merge release/v1 to main

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20'
+        go-version: '1.22'
     - name: Run Build
       run: go build -o ./out/manager ./cmd/main.go
     - name: Run Test

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM  mcr.microsoft.com/oss/go/microsoft/golang:1.20-cbl-mariner2.0 as builder
+FROM  mcr.microsoft.com/oss/go/microsoft/golang:1.22-cbl-mariner2.0 as builder
 
 ARG MODULE_VERSION
 WORKDIR /workspace

api/v1/azureappconfigurationprovider_types.go

@@ -30,12 +30,14 @@ import (
 type AzureAppConfigurationProviderSpec struct {
 	// The endpoint url of AppConfiguration which should sync the configuration key-values from.
 	// +kubebuilder:validation:Format=uri
-	Endpoint                  *string                                  `json:"endpoint,omitempty"`
+	Endpoint *string `json:"endpoint,omitempty"`
+	// +kubebuilder:default=true
+	ReplicaDiscoveryEnabled   bool                                     `json:"replicaDiscoveryEnabled,omitempty"`
 	ConnectionStringReference *string                                  `json:"connectionStringReference,omitempty"`
 	Target                    ConfigurationGenerationParameters        `json:"target"`
 	Auth                      *AzureAppConfigurationProviderAuth       `json:"auth,omitempty"`
 	Configuration             AzureAppConfigurationKeyValueOptions     `json:"configuration,omitempty"`
-	Secret                    *AzureKeyVaultReference                  `json:"secret,omitempty"`
+	Secret                    *SecretReference                         `json:"secret,omitempty"`
 	FeatureFlag               *AzureAppConfigurationFeatureFlagOptions `json:"featureFlag,omitempty"`
 }
 
@@ -79,8 +81,9 @@ type AzureAppConfigurationFeatureFlagOptions struct {
 
 // KeyLabelSelector defines the filters when fetching the data from Azure AppConfiguration
 type Selector struct {
-	KeyFilter   string  `json:"keyFilter"`
-	LabelFilter *string `json:"labelFilter,omitempty"`
+	KeyFilter    *string `json:"keyFilter,omitempty"`
+	LabelFilter  *string `json:"labelFilter,omitempty"`
+	SnapshotName *string `json:"snapshotName,omitempty"`
 }
 
 // Defines the settings for dynamic configuration.
@@ -141,8 +144,8 @@ type ManagedIdentityReferenceParameters struct {
 	Key string `json:"key"`
 }
 
-// AzureKeyVaultReference defines the authentication type used to Azure KeyVault resolve KeyVaultReference
-type AzureKeyVaultReference struct {
+// SecretReference defines the settings for resolving secret reference type items
+type SecretReference struct {
 	Target  SecretGenerationParameters `json:"target"`
 	Auth    *AzureKeyVaultAuth         `json:"auth,omitempty"`
 	Refresh *RefreshSettings           `json:"refresh,omitempty"`

config/crd/bases/azconfig.io_azureappconfigurationproviders.yaml

@@ -115,8 +115,8 @@ spec:
                           type: string
                         labelFilter:
                           type: string
-                      required:
-                      - keyFilter
+                        snapshotName:
+                          type: string
                       type: object
                     type: array
                   trimKeyPrefixes:
@@ -157,14 +157,17 @@ spec:
                           type: string
                         labelFilter:
                           type: string
-                      required:
-                      - keyFilter
+                        snapshotName:
+                          type: string
                       type: object
                     type: array
                 type: object
+              replicaDiscoveryEnabled:
+                default: true
+                type: boolean
               secret:
-                description: AzureKeyVaultReference defines the authentication type
-                  used to Azure KeyVault resolve KeyVaultReference
+                description: SecretReference defines the settings for resolving secret
+                  reference type items
                 properties:
                   auth:
                     properties:

go.mod

@@ -1,13 +1,14 @@
 module azappconfig/provider
 
-go 1.20
+go 1.22
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.11.0
 	github.com/golang/mock v1.6.0
 	github.com/onsi/gomega v1.27.8
-	golang.org/x/sync v0.3.0
+	golang.org/x/crypto v0.21.0
+	golang.org/x/sync v0.6.0
 	k8s.io/apimachinery v0.26.2
 	k8s.io/client-go v0.26.2
 	sigs.k8s.io/controller-runtime v0.14.5
@@ -27,12 +28,14 @@ require (
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
 )
 
 require (
@@ -67,12 +70,11 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
+	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/oauth2 v0.5.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
@@ -90,4 +92,5 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
+	software.sslmate.com/src/go-pkcs12 v0.4.0
 )