address comment from Mat and Hunter

Signed-off-by: Anubhab Majumdar <[email protected]>
microsoft · Jun 21, 2024 · 784710b · 784710b
1 parent ac3efdd
commit 784710b
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 55 deletions.
diff --git a/Makefile b/Makefile
@@ -527,4 +527,4 @@ quick-deploy-hubble:
 
 .PHONY: simplify-dashboards
 simplify-dashboards:
- cd deploy/legacy/grafana/dashboards/ && go test . -tags=dashboard,simplifydashboard -v
+ go test -tags=dashboard,simplifydashboard -v ./deploy/...
diff --git a/cmd/hubble/daemon_main_linux.go b/cmd/hubble/daemon_main_linux.go
@@ -269,7 +269,7 @@ func setupZapLogger(retinaConfig *config.Config, k8sCfg *rest.Config) *log.ZapLo
  logger.Fatalf("Failed to setup zap logger: %v", err)
  }
 
- namedLogger := log.Logger().Named("retina-enterprise")
+ namedLogger := log.Logger().Named("retina-with-hubble")
  namedLogger.Info("Traces telemetry initialized with zapai", zap.String("version", retinaVersion), zap.String("appInsightsID", applicationInsightsID))
 
  return namedLogger

diff --git a/cmd/hubble/subcmd_linux.go b/cmd/hubble/subcmd_linux.go
diff --git a/deploy/hubble/manifests/controller/helm/retina/values.yaml b/deploy/hubble/manifests/controller/helm/retina/values.yaml
@@ -16,7 +16,7 @@ os:
 # FIXME: remove unnecessary pieces, etc.
 operator:
  enabled: true
- repository: acndev.azurecr.io/retina-operator-enterprise
+ repository: acndev.azurecr.io/retina-operator
  pullPolicy: Always
  tag: "latest"
  leaderElection: true
@@ -27,12 +27,12 @@ agent:
  leaderElection: false
  enabled: true
  name: retina-agent
- repository: acndev.azurecr.io/retina-agent-enterprise
+ repository: acndev.azurecr.io/retina-agent
  tag: "latest"
  init:
  enabled: true
  name: retina-agent-init
- repository: acndev.azurecr.io/retina-agent-init-enterprise
+ repository: acndev.azurecr.io/retina-agent-init
  tag: "latest"
  pullPolicy: Always
  container:

diff --git a/deploy/legacy/graphana/dashboards/README.md b/deploy/legacy/graphana/dashboards/README.md
diff --git a/pkg/hubble/hubble_linux.go b/pkg/hubble/hubble_linux.go
@@ -62,7 +62,6 @@ func newRetinaHubble(params hubbleParams) *RetinaHubble {
 }
 
 func (rh *RetinaHubble) defaultOptions() {
- // Set the default values for Retina-enterprise.
  // Not final, will be updated later.
  option.Config.HubblePreferIpv6 = false
  option.Config.EnableHighScaleIPcache = false

diff --git a/pkg/shared/config/type.go b/pkg/shared/config/type.go
@@ -1 +1,2 @@
+// Placeholder file. Required for windows build and lint.
 package config
diff --git a/pkg/shared/telemetry/type.go b/pkg/shared/telemetry/type.go
@@ -1 +1,2 @@
+// Placeholder file. Required for windows build and lint.
 package telemetry