Merge branch 'master' into hetzner-readme-link

kubernetes-sigs · Nov 21, 2023 · ab40010 · ab40010
2 parents 45a1ee7 + 70eb2b7
commit ab40010
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/.github/workflows/gh-workflow-approve.yaml b/.github/workflows/gh-workflow-approve.yaml
@@ -17,7 +17,7 @@ jobs:
       actions: write
     steps:
       - name: Update PR
-        uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         continue-on-error: true
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -76,10 +76,14 @@ ExternalDNS has introduced a webhook system, which can be used to add a new prov
 See PR #3063 for all the discussions about it.
 
 Known providers using webhooks:
-* https://github.com/ionos-cloud/external-dns-ionos-plugin
-* https://github.com/muhlba91/external-dns-provider-adguard
-* https://github.com/stackitcloud/external-dns-stackit-webhook
-* (UNOFFICIAL) https://github.com/mconfalonieri/external-dns-hetzner-webhook
+
+| Provider |  Repo |
+| -------- | ----------- |
+| IONOS | https://github.com/ionos-cloud/external-dns-ionos-plugin | 
+| Adguard Home Provider | https://github.com/muhlba91/external-dns-provider-adguard | 
+| STACKIT | https://github.com/stackitcloud/external-dns-stackit-webhook | 
+| GleSYS | https://github.com/glesys/external-dns-glesys | 
+| Hetzner | https://github.com/mconfalonieri/external-dns-hetzner-webhook | 
 
 ## Status of providers
 

diff --git a/docs/tutorials/infoblox.md b/docs/tutorials/infoblox.md
@@ -79,6 +79,7 @@ spec:
         - --infoblox-wapi-version=2.3.1     # (optional) Infoblox WAPI version. The default is "2.3.1"
         - --infoblox-ssl-verify             # (optional) Use --no-infoblox-ssl-verify to skip server certificate verification.
         - --infoblox-create-ptr             # (optional) Use --infoblox-create-ptr to create a ptr entry in addition to an entry.
+        - --infoblox-view=""                # (optional) DNS view (default: "")
         env:
         - name: EXTERNAL_DNS_INFOBLOX_HTTP_POOL_CONNECTIONS
           value: "10" # (optional) Infoblox WAPI request connection pool size. The default is "10".
@@ -160,6 +161,7 @@ spec:
         - --infoblox-wapi-version=2.3.1     # (optional) Infoblox WAPI version. The default is "2.3.1"
         - --infoblox-ssl-verify             # (optional) Use --no-infoblox-ssl-verify to skip server certificate verification.
         - --infoblox-create-ptr             # (optional) Use --infoblox-create-ptr to create a ptr entry in addition to an entry.
+        - --infoblox-view=""                # (optional) DNS view (default: "")        
         env:
         - name: EXTERNAL_DNS_INFOBLOX_HTTP_POOL_CONNECTIONS
           value: "10" # (optional) Infoblox WAPI request connection pool size. The default is "10".

diff --git a/provider/scaleway/scaleway.go b/provider/scaleway/scaleway.go
@@ -65,7 +65,18 @@ func NewScalewayProvider(ctx context.Context, domainFilter endpoint.DomainFilter
 			defaultPageSize = 1000
 		}
 	}
-	p, _ := scw.MustLoadConfig().GetActiveProfile()
+
+	p := &scw.Profile{}
+	c, err := scw.LoadConfig()
+	if err != nil {
+		log.Warnf("Cannot load config: %v", err)
+	} else {
+		p, err = c.GetActiveProfile()
+		if err != nil {
+			log.Warnf("Cannot get active profile: %v", err)
+		}
+	}
+
 	scwClient, err := scw.NewClient(
 		scw.WithProfile(p),
 		scw.WithEnv(),

diff --git a/provider/scaleway/scaleway_test.go b/provider/scaleway/scaleway_test.go
@@ -161,6 +161,14 @@ func TestScalewayProvider_NewScalewayProvider(t *testing.T) {
 	}
 }
 
+func TestScalewayProvider_OptionnalConfigFile(t *testing.T) {
+	_ = os.Setenv(scw.ScwAccessKeyEnv, "SCWXXXXXXXXXXXXXXXXX")
+	_ = os.Setenv(scw.ScwSecretKeyEnv, "11111111-1111-1111-1111-111111111111")
+
+	_, err := NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true)
+	assert.NoError(t, err)
+}
+
 func TestScalewayProvider_AdjustEndpoints(t *testing.T) {
 	provider := &ScalewayProvider{}