Skip to content

Commit

Permalink
Remove outdated comment and fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
cescgina authored and openshift-merge-bot[bot] committed Jan 24, 2025
1 parent 2418a36 commit a7a6231
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions controllers/watcherapi_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,6 @@ func (r *WatcherAPIReconciler) generateServiceConfigs(

labels := labels.GetLabels(instance, labels.GetGroupLabel(WatcherAPILabelPrefix), map[string]string{})

// jgilaber this might be wrong? we should probably get keystonapi in the
// watcher controller and set the url in the spec eventually?
keystoneAPI, err := keystonev1.GetKeystoneAPI(ctx, helper, instance.Namespace, map[string]string{})
// KeystoneAPI not available we should not aggregate the error and continue
if err != nil {
Expand All @@ -292,8 +290,6 @@ func (r *WatcherAPIReconciler) generateServiceConfigs(
return err
}
// customData hold any customization for the service.
// NOTE jgilaber making an empty map for now, we'll probably want to
// implement CustomServiceConfig later
var tlsCfg *tls.Service
if instance.Spec.TLS.Ca.CaBundleSecretName != "" {
tlsCfg = &tls.Service{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/watcher/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ const (
// DefaultsConfigFileName - File name with default configuration
DefaultsConfigFileName = "00-default.conf"

// GlobalCustomConfigFileName - File name with custom configuration define in Watcher
// GlobalCustomConfigFileName - File name with custom configuration defined in Watcher
GlobalCustomConfigFileName = "01-global-custom.conf"

// ServiceCustomConfigFileName - File name with custom configuration define in SubCRs
// ServiceCustomConfigFileName - File name with custom configuration defined in SubCRs
ServiceCustomConfigFileName = "02-service-custom.conf"

// LogVolume is the default logVolume name used to mount logs
Expand Down

0 comments on commit a7a6231

Please sign in to comment.