Skip to content

Commit

Permalink
update image repo name
Browse files Browse the repository at this point in the history
  • Loading branch information
pb82 committed Apr 24, 2019
1 parent e930d0b commit ef21071
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ORG=integr8ly
NAMESPACE=application-monitoring
ORG=integreatly
NAMESPACE=middleware-monitoring
PROJECT=grafana-operator
REG=quay.io
SHELL=/bin/bash
Expand Down
17 changes: 11 additions & 6 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,23 @@ import (
)

var log = logf.Log.WithName("cmd")
var flagImage string
var flagImageTag string

func printVersion() {
log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
log.Info(fmt.Sprintf("operator-sdk Version: %v", sdkVersion.Version))
}

func main() {
flagImage := flag.String("grafana-image", "", "Overrides the default Grafana image")
flagImageTag := flag.String("grafana-image-tag", "", "Overrides the default Grafana image tag")
flag.Parse()
func init() {
flagset := flag.CommandLine
flagset.StringVar(&flagImage, "grafana-image", "", "Overrides the default Grafana image")
flagset.StringVar(&flagImageTag, "grafana-image-tag", "", "Overrides the default Grafana image tag")
flagset.Parse(os.Args[1:])
}

func main() {
// The logger instantiated here can be changed to any logger
// implementing the logr.Logger interface. This logger will
// be propagated through the whole operator, generating
Expand All @@ -44,8 +49,8 @@ func main() {

// Controller configuration
controllerConfig := grafana.GetControllerConfig()
controllerConfig.AddConfigItem(grafana.ConfigGrafanaImage, *flagImage)
controllerConfig.AddConfigItem(grafana.ConfigGrafanaImageTag, *flagImageTag)
controllerConfig.AddConfigItem(grafana.ConfigGrafanaImage, flagImage)
controllerConfig.AddConfigItem(grafana.ConfigGrafanaImageTag, flagImageTag)

namespace, err := k8sutil.GetWatchNamespace()
if err != nil {
Expand Down

0 comments on commit ef21071

Please sign in to comment.