Skip to content

Commit 90054dc

Browse files
authored
Update deployment api group to v1 (#7)
And better error handling
1 parent 6495a5c commit 90054dc

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

charts/alidns-webhook/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: apps/v1beta2
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: {{ include "alidns-webhook.fullname" . }}

main.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type aliDNSProviderConfig struct {
8080

8181
AccessToken cmmetav1.SecretKeySelector `json:"accessTokenSecretRef"`
8282
SecretToken cmmetav1.SecretKeySelector `json:"secretKeySecretRef"`
83-
Regionid string `json:"regionId"`
83+
Regionid string `json:"regionId"`
8484
}
8585

8686
// Name is used as the name for this DNS solver when referencing it on the ACME
@@ -108,6 +108,9 @@ func (c *aliDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
108108
fmt.Printf("Decoded configuration: %v\n", cfg)
109109

110110
accessToken, err := c.loadSecretData(cfg.AccessToken, ch.ResourceNamespace)
111+
if err != nil {
112+
return err
113+
}
111114
secretKey, err := c.loadSecretData(cfg.SecretToken, ch.ResourceNamespace)
112115
if err != nil {
113116
return err
@@ -117,6 +120,9 @@ func (c *aliDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
117120
credential := credentials.NewAccessKeyCredential(string(accessToken), string(secretKey))
118121

119122
client, err := alidns.NewClientWithOptions(cfg.Regionid, conf, credential)
123+
if err != nil {
124+
return err
125+
}
120126
c.aliDNSClient = client
121127

122128
_, zoneName, err := c.getHostedZone(ch.ResolvedZone)

0 commit comments

Comments
 (0)