Skip to content

Commit

Permalink
handle errors
Browse files Browse the repository at this point in the history
  • Loading branch information
royhadad committed Jul 9, 2023
1 parent 098ffcc commit 324cc7c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ helm-install-staging:
--set image.repository="datree/webhook-staging" \
--set image.tag="latest" \
--set securityContext.seccompProfile=null \
--set securityContext.runAsUser=null \
--set datree.labelKubeSystem=false \
--set securityContext.runAsUser=null \
--set datree.labelKubeSystem=false \
--debug && \
make change-ping-uninstall-url-to-production

Expand Down
5 changes: 4 additions & 1 deletion internal/startup/startup.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func Start() {
basicCliClient := clients.NewCliServiceClient(deploymentConfig.URL, basicNetworkValidator, state)
errorReporter := errorReporter.NewErrorReporter(basicCliClient, state)
internalLogger := logger.New("", errorReporter)
openshiftServiceInstance, err := openshiftService.NewOpenshiftService()

defer func() {
if panicErr := recover(); panicErr != nil {
Expand All @@ -54,6 +53,10 @@ func Start() {
}
}()

openshiftServiceInstance, err := openshiftService.NewOpenshiftService()
if err != nil {
panic(err) // should never happen
}
k8sClientInstance, err := k8sClient.NewK8sClient()
var leaderElectionLeaseGetter v1.LeasesGetter = nil
if err == nil && k8sClientInstance != nil {
Expand Down
9 changes: 7 additions & 2 deletions pkg/services/validationService.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ func (vs *ValidationService) Validate(admissionReviewReq *admission.AdmissionRev
cliEvaluationId := -1
var err error

res, err := vs.OpenshiftService.GetGroupsUserBelongsTo("[email protected]")
fmt.Println("@@@@@@@@@@@@1")
fmt.Println(res, err)
fmt.Println("@@@@@@@@@@@@")

ciContext := ciContext.Extract()

clusterK8sVersion := vs.State.GetK8sVersion()
Expand Down Expand Up @@ -411,11 +416,11 @@ func (vs *ValidationService) shouldBypassByPermissions(userInfo authenticationv1
userName = openShiftRequester

// override groups
groupsFromOpenshiftClient, err := vs.OpenshiftService.GetGroupsUserBelongsTo(openShiftRequester)
groupsFromOpenshiftService, err := vs.OpenshiftService.GetGroupsUserBelongsTo(openShiftRequester)
if err != nil {
vs.Logger.LogError(fmt.Sprintf("Failed to get groups for user %s from openshift service: %s", openShiftRequester, err.Error()))
} else {
groups = groupsFromOpenshiftClient
groups = groupsFromOpenshiftService
}
}

Expand Down

0 comments on commit 324cc7c

Please sign in to comment.