dentaku/woodpecker-helm3
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #30 from pelotech/noncompulsory-certificate

Browse source 
Make the Certificate setting optional
This commit is contained in:
Joachim Hill-Grannec 2019-12-26 11:36:38 -08:00 committed by GitHub
parent fbfb69f063 81c4877a92
commit 8857782826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/run/initkube.go
View file

@ -50,9 +50,6 @@ func (i *InitKube) Prepare(cfg Config) error {
if i.Token == "" { if i.Token == "" {
return errors.New("token is needed to deploy") return errors.New("token is needed to deploy")
} }
if i.Certificate == "" && !i.SkipTLSVerify {
return errors.New("certificate is needed to deploy")
}
if i.ServiceAccount == "" { if i.ServiceAccount == "" {
i.ServiceAccount = "helm" i.ServiceAccount = "helm"

7
internal/run/initkube_test.go
View file

@ -134,13 +134,6 @@ func (suite *InitKubeTestSuite) TestPrepareRequiredConfig() {
init.APIServer = "Sysadmin" init.APIServer = "Sysadmin"
init.Token = "" init.Token = ""
suite.Error(init.Prepare(cfg), "Token should be required.") suite.Error(init.Prepare(cfg), "Token should be required.")
init.Token = "Aspire virtual currency"
init.Certificate = ""
suite.Error(init.Prepare(cfg), "Certificate should be required.")
init.SkipTLSVerify = true
suite.NoError(init.Prepare(cfg), "Certificate should not be required if SkipTLSVerify is true")
} }
func (suite *InitKubeTestSuite) TestPrepareDefaultsServiceAccount() { func (suite *InitKubeTestSuite) TestPrepareDefaultsServiceAccount() {

2
kubeconfig
View file

@ -3,7 +3,7 @@ clusters:
- cluster: - cluster:
{{- if eq .SkipTLSVerify true }} {{- if eq .SkipTLSVerify true }}
insecure-skip-tls-verify: true insecure-skip-tls-verify: true
{{- else }} {{- else if .Certificate }}
certificate-authority-data: {{ .Certificate }} certificate-authority-data: {{ .Certificate }}
{{- end}} {{- end}}
server: {{ .APIServer }} server: {{ .APIServer }}