public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#318 Fix code review issues

This commit is contained in:
Mikolaj Karebski 2020-04-03 10:59:01 +02:00
parent fe74f4074c
commit 32ae0c58f4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/configuration/base/reconcile.go
View File

@ -287,7 +287,7 @@ func (r *ReconcileJenkinsBaseConfiguration) createInitConfigurationConfigMap(met
func (r *ReconcileJenkinsBaseConfiguration) createBaseConfigurationConfigMap(meta metav1.ObjectMeta) error { func (r *ReconcileJenkinsBaseConfiguration) createBaseConfigurationConfigMap(meta metav1.ObjectMeta) error {
configMap, err := resources.NewBaseConfigurationConfigMap(meta, r.Configuration.Jenkins) configMap, err := resources.NewBaseConfigurationConfigMap(meta, r.Configuration.Jenkins)
if err != nil { if err != nil {
return stackerr.WithStack(err) return err
} }
return stackerr.WithStack(r.CreateOrUpdateResource(configMap)) return stackerr.WithStack(r.CreateOrUpdateResource(configMap))
} }

5
pkg/controller/jenkins/configuration/base/resources/service.go
View File

@ -5,6 +5,7 @@ import (
"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants"
"github.com/operator-framework/operator-sdk/pkg/k8sutil" "github.com/operator-framework/operator-sdk/pkg/k8sutil"
stackerr "github.com/pkg/errors"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
@ -76,7 +77,7 @@ func getClusterDomain() (string, error) {
cname, err := net.LookupCNAME(apiSvc) cname, err := net.LookupCNAME(apiSvc)
if err != nil { if err != nil {
return "", err return "", stackerr.WithStack(err)
} }
clusterDomain = strings.TrimPrefix(cname, "kubernetes.default.svc") clusterDomain = strings.TrimPrefix(cname, "kubernetes.default.svc")
@ -94,5 +95,5 @@ func isRunningInCluster() (bool, error) {
} }
return true, nil return true, nil
} }
return false, err return false, stackerr.WithStack(err)
} }