Skip to content

Commit dd31ce6

Browse files
authored
Merge pull request #26 from 23technologies/set-issuer-values
Configure issuer in 23ke-config secret
2 parents 3a8da35 + 2a0a43a commit dd31ce6

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

pkg/install/v2/install_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ func init() {
8080
"gardenlet.seedpodcidr": "100.73.0.0/16",
8181
"gardenlet.seedservicecidr": "100.88.0.0/13",
8282
"issuer.acme.email": "test@example.org",
83+
"issuer.acme.server": "example.acme.server",
84+
"issuer.ca": "my-great-ca",
8385
"kubeapiserver.basicauthpassword": "my-basic-auth-password",
8486

8587
"version": "test",
@@ -130,6 +132,8 @@ func init() {
130132
viper.Set("kubeApiServer.basicAuthPassword", testConfig["kubeapiserver.basicauthpassword"])
131133
viper.Set("clusterIdentity", testConfig["clusteridentity"])
132134
viper.Set("cloudprofiles", testConfig["cloudprofiles"])
135+
viper.Set("issuer.ca", testConfig["issuer.ca"])
136+
viper.Set("issuer.acme.server", testConfig["issuer.acme.server"])
133137

134138
_, err = git.PlainInit(configRepo, true)
135139
if err != nil {
@@ -192,6 +196,9 @@ issuer:
192196
enabled: true
193197
acme:
194198
email: test@example.org
199+
server: %s
200+
ca: |
201+
%s
195202
kubeApiServer:
196203
basicAuthPassword: %s
197204
backups:
@@ -214,6 +221,8 @@ backups:
214221
testConfig["domainconfig"].(map[string]any)["credentials"].(map[string]string)["clientsecret"],
215222
testConfig["domainconfig"].(map[string]any)["credentials"].(map[string]string)["subscriptionid"],
216223
testConfig["domainconfig"].(map[string]any)["credentials"].(map[string]string)["tenantid"],
224+
testConfig["issuer.acme.server"],
225+
testConfig["issuer.ca"],
217226
testConfig["kubeapiserver.basicauthpassword"],
218227
testConfig["backupconfig"].(map[string]any)["enabled"].(bool),
219228
testConfig["backupconfig"].(map[string]any)["provider"].(string),

pkg/install/v2/secrets.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,11 @@ stringData:
6363
basicAuthPassword: {{ .KubeApiServer.BasicAuthPassword }}
6464
issuer:
6565
enabled: true
66+
ca: |
67+
{{- nindent 8 .Issuer.Ca }}
6668
acme:
6769
email: {{ .Issuer.Acme.Email }}
70+
server: {{ .Issuer.Acme.Server }}
6871
domains:
6972
global: # means used for ingress, gardener defaultDomain and internalDomain
7073
{{- nindent 8 (toYaml .DomainConfig) }}

0 commit comments

Comments
 (0)