Skip to content

Commit

Permalink
refactor: rename legacy control plane to standard and update related …
Browse files Browse the repository at this point in the history
…scripts and docs (#1259)

# Description

This pull request includes significant changes to transition from the
"legacy" to the "standard" directory and package structure. The changes
involve updates to Helm charts, Makefile commands, package imports, and
file paths.

Directory and package structure updates:

*
[`.github/workflows/release-charts.yaml`](diffhunk://#diff-711012dcc1f315d20ef98e04b14cbc0cb1a388641934c2151ac99f74ff11f62cL43-R43):
Updated the Helm package path from `legacy` to `standard`.
*
[`Makefile`](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L447-R447):
Updated multiple Helm install commands to use the `standard` directory
instead of `legacy`.
[[1]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L447-R447)
[[2]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L460-R460)
[[3]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L477-R477)
[[4]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L496-R496)
*
[`cmd/root.go`](diffhunk://#diff-ab967ab1a2f3a1b769106eeb7bfe892ef0e81d1d27811fa15be08e6749feee1fL9-R9):
Changed package imports and daemon initialization from `legacy` to
`standard`.
[[1]](diffhunk://#diff-ab967ab1a2f3a1b769106eeb7bfe892ef0e81d1d27811fa15be08e6749feee1fL9-R9)
[[2]](diffhunk://#diff-ab967ab1a2f3a1b769106eeb7bfe892ef0e81d1d27811fa15be08e6749feee1fL31-R31)
* Renamed files from `legacy` to `standard`:
  * `cmd/legacy/daemon.go` to `cmd/standard/daemon.go`
  * `cmd/legacy/daemon_linux.go` to `cmd/standard/daemon_linux.go`
  * `cmd/legacy/daemon_windows.go` to `cmd/standard/daemon_windows.go`
*
[`crd/Makefile`](diffhunk://#diff-414956f6f35c3bc4a93c4c08592ee22397d76d99a1b728e1e33c65075a2a99c8L7-R7):
Updated the `HELM_CRD_DIR` path to use the `standard` directory.

File deletions and renames:

* Deleted `deploy/legacy/prometheus/retina/create-cm.sh`.
* Renamed
`deploy/legacy/manifests/controller/helm/retina/templates/NOTES.txt` to
`deploy/standard/manifests/controller/helm/retina/templates/NOTES.txt`
with updated paths inside the file.

## Related Issue

This PR will close #1115 

## Checklist

- [x] I have read the [contributing
documentation](https://retina.sh/docs/contributing).
- [x] I signed and signed-off the commits (`git commit -S -s ...`). See
[this
documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
on signing commits.
- [x] I have correctly attributed the author(s) of the code.
- [x] I have tested the changes locally.
- [x] I have followed the project's style guidelines.
- [x] I have updated the documentation, if necessary.
- [x] I have added tests, if applicable.

## Screenshots (if applicable) or Testing Completed

Please add any relevant screenshots or GIFs to showcase the changes
made.

## Additional Notes

Add any additional notes or context about the pull request here.

---

Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more
information on how to contribute to this project.

---------

Signed-off-by: Ritwik Ranjan <[email protected]>
Co-authored-by: kamilprz <[email protected]>
  • Loading branch information
ritwikranjan and kamilprz authored Jan 23, 2025
1 parent 387a905 commit c87f650
Show file tree
Hide file tree
Showing 63 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-charts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
set -euo pipefail
export TAG=$(make version)
helm package ./deploy/legacy/manifests/controller/helm/retina --version $TAG
helm package ./deploy/standard/manifests/controller/helm/retina --version $TAG
# Get Helm chart's SHA digest from helm push cmd output
helm push retina-$TAG.tgz oci://ghcr.io/${{ github.repository }}/charts >> helm_push_result.txt 2>&1
cat helm_push_result.txt
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ HELM_IMAGE_TAG ?= $(LATEST_TAG)

# basic/node-level mode
helm-install: manifests
helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
--namespace kube-system \
--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
Expand All @@ -457,7 +457,7 @@ helm-install: manifests
--set enabledPlugin_linux="\[dropreason\,packetforward\,linuxutil\,dns\]"

helm-install-with-operator: manifests
helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
--namespace kube-system \
--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
Expand All @@ -474,7 +474,7 @@ helm-install-with-operator: manifests

# advanced/pod-level mode with scale limitations, where metrics are aggregated by source and destination Pod
helm-install-advanced-remote-context: manifests
helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
--namespace kube-system \
--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
Expand All @@ -493,7 +493,7 @@ helm-install-advanced-remote-context: manifests

# advanced/pod-level mode designed for scale, where metrics are aggregated by "local" Pod (source for outgoing traffic, destination for incoming traffic)
helm-install-advanced-local-context: manifests
helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
--namespace kube-system \
--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"os"

"github.com/microsoft/retina/cmd/legacy"
"github.com/microsoft/retina/cmd/standard"
"github.com/spf13/cobra"
)

Expand All @@ -28,7 +28,7 @@ var (
RunE: func(cmd *cobra.Command, args []string) error {
// Do Stuff Here
fmt.Println("Starting Retina Agent")
d := legacy.NewDaemon(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
d := standard.NewDaemon(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
if err := d.Start(); err != nil {
return fmt.Errorf("starting daemon: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/legacy/daemon.go → cmd/standard/daemon.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
package legacy
package standard

import (
"fmt"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package legacy
package standard

import "github.com/cilium/ebpf/rlimit"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package legacy
package standard

func (d *Daemon) RemoveMemlock() error {
// This function is a no-op on Windows.
Expand Down
2 changes: 1 addition & 1 deletion crd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ REPO_ROOT = $(shell git rev-parse --show-toplevel)
TOOLS_DIR = $(REPO_ROOT)/hack/tools
TOOLS_BIN_DIR = $(TOOLS_DIR)/bin
CONTROLLER_GEN = $(TOOLS_BIN_DIR)/controller-gen
HELM_CRD_DIR = $(REPO_ROOT)/deploy/legacy/manifests/controller/helm/retina/crds
HELM_CRD_DIR = $(REPO_ROOT)/deploy/standard/manifests/controller/helm/retina/crds

.PHONY: generate manifests

Expand Down
3 changes: 0 additions & 3 deletions deploy/legacy/prometheus/retina/create-cm.sh

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1. Installing retina service using helm: helm install retina ./deploy/legacy/manifests/controller/helm/retina/ --namespace kube-system --dependency-update
1. Installing retina service using helm: helm install retina ./deploy/standard/manifests/controller/helm/retina/ --namespace kube-system --dependency-update
2. Cleaning up/uninstalling/deleting retina and dependencies related:
helm uninstall retina -n kube-system
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

kubectl delete cm ama-metrics-prometheus-config-node -n kube-system
kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/legacy/prometheus/cilium/prometheus-config -n kube-system
kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/standard/prometheus/cilium/prometheus-config -n kube-system
k rollout restart ds ama-metrics-node -n kube-system
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

kubectl delete cm ama-metrics-prometheus-config-node -n kube-system

kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/legacy/prometheus/retina-windows/prometheus-config -n kube-system
kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/standard/prometheus/retina-windows/prometheus-config -n kube-system
3 changes: 3 additions & 0 deletions deploy/standard/prometheus/retina/create-cm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/standard/prometheus/retina/prometheus-config -n kube-system
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/02-Installation/01-Setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Note: you can also run captures with just the [CLI](./02-CLI.md).

The installation of Retina can be configured using different control planes and modes.

You can choose between the "legacy" control plane (the original implementation of Retina) and Hubble.
You can choose between the "Standard" control plane (the original implementation of Retina) and Hubble.

If the "legacy" control plane is chosen, different modes are available. The available metric dimensions depend on the selected mode. For an explanation of the available modes, see [Legacy Metric Modes](../03-Metrics/modes/modes.md).
If the "Standard" control plane is chosen, different modes are available. The available metric dimensions depend on the selected mode. For an explanation of the available modes, see [Standard Metric Modes](../03-Metrics/modes/modes.md).

Modes are not applicable to the Hubble control plane. For metrics related to the Hubble control plane, refer to the [Hubble metrics](../03-Metrics/02-hubble_metrics.md) documentation.

Expand Down
2 changes: 1 addition & 1 deletion docs/02-Installation/03-Config.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Default Configuration

Default settings for each component are specified in [Values file](../../deploy/legacy/manifests/controller/helm/retina/values.yaml).
Default settings for each component are specified in [Values file](../../deploy/standard/manifests/controller/helm/retina/values.yaml).

### Deployed Configuration

Expand Down
6 changes: 3 additions & 3 deletions docs/02-Installation/04-prometheus.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Prometheus is an open-source system monitoring and alerting toolkit originally b

1. Create a Kubernetes cluster.
2. Install Retina DaemonSet (see [Quick Installation](./01-Setup.md)).
3. Clone [Retina Repository](https://github.com/microsoft/retina) or download [Prometheus Values File](../../deploy/legacy/prometheus/values.yaml).
3. Clone [Retina Repository](https://github.com/microsoft/retina) or download [Prometheus Values File](../../deploy/standard/prometheus/values.yaml).

## Install Prometheus via Helm

Expand All @@ -21,15 +21,15 @@ Prometheus is an open-source system monitoring and alerting toolkit originally b

```shell
# The value of VALUE_FILE_PATH is relative to the repo root folder. Update this according to the location of your file.
VALUE_FILE_PATH=deploy/legacy/prometheus/values.yaml
VALUE_FILE_PATH=deploy/standard/prometheus/values.yaml
helm install prometheus -n kube-system -f $VALUE_FILE_PATH prometheus-community/kube-prometheus-stack
```

Or if you already have the chart installed, upgrade how you see fit, providing the new job name as an additional scrape config, ex:

```shell
# The value of VALUE_FILE_PATH is relative to the repo root folder. Update this according to the location of your file.
VALUE_FILE_PATH=deploy/legacy/prometheus/values.yaml
VALUE_FILE_PATH=deploy/standard/prometheus/values.yaml
helm upgrade prometheus -n kube-system -f $VALUE_FILE_PATH prometheus-community/kube-prometheus-stack
```

Expand Down
2 changes: 1 addition & 1 deletion docs/02-Installation/05-grafana.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ If you followed the steps to install and configure [Prometheus](./04-prometheus.

## Retina Dashboards

There is a set of Retina dashboards that you can import directly into Grafana as json files. The dashboards are found under `deploy/legacy/grafana/dashboards/` if you installed retina legacy controlplane, and under `deploy/hubble/grafana/dashboards/` if you installed retina hubble controlplane.
There is a set of Retina dashboards that you can import directly into Grafana as json files. The dashboards are found under `deploy/standard/grafana/dashboards/` if you installed retina standard controlplane, and under `deploy/hubble/grafana/dashboards/` if you installed retina hubble controlplane.

Here is an example of the Retina `dns.json` dashboard.

Expand Down
2 changes: 1 addition & 1 deletion docs/02-Installation/aks-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
8. Push to container registry:
`docker push <container-registry-url>/retina:<TAG>`
9. Installing retina onto the cluster -
`helm install retina <retina-repository-path>/deploy/legacy/manifests/controller/helm/retina/ --create-namespace --namespace retina --dependency-update`
`helm install retina <retina-repository-path>/deploy/standard/manifests/controller/helm/retina/ --create-namespace --namespace retina --dependency-update`
6 changes: 3 additions & 3 deletions docs/03-Metrics/01-metrics-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Prometheus metrics available depend on the Retina control plane deployed.

## Control Planes

There are two control planes used in the Retina project: Hubble and the legacy control plane. Both control planes create metrics and traces which are generated by the eBPF data plane, which has a single implementation. Only one control plane should be deployed at a given time. Helm charts for the deployment are found under `deploy/hubble/manifests/controller/helm/retina` and `deploy/legacy/manifests/controller/helm/retina`.
There are two control planes used in the Retina project: Hubble and the Standard control plane. Both control planes create metrics and traces which are generated by the eBPF data plane, which has a single implementation. Only one control plane should be deployed at a given time. Helm charts for the deployment are found under `deploy/hubble/manifests/controller/helm/retina` and `deploy/standard/manifests/controller/helm/retina`.

1. [Hubble metrics](./02-hubble_metrics.md)
2. [Legacy metrics](./modes/modes.md)
2. [Standard metrics](./modes/modes.md)

> Note: Hubble offers additional features and metrics that the legacy control plane does not support. The plan is to deprecate the legacy control plane in favor of Hubble. For further documentation on Hubble, check [Cilium/Hubble repository](https://github.com/cilium/hubble/?tab=readme-ov-file#features) and official [Hubble metrics documentation](https://docs.cilium.io/en/stable/observability/metrics/#hubble-metrics)
> Note: Hubble offers additional features and metrics that the Standard control plane does not support. The plan is to deprecate the Standard control plane in favor of Hubble. For further documentation on Hubble, check [Cilium/Hubble repository](https://github.com/cilium/hubble/?tab=readme-ov-file#features) and official [Hubble metrics documentation](https://docs.cilium.io/en/stable/observability/metrics/#hubble-metrics)
2 changes: 1 addition & 1 deletion docs/03-Metrics/modes/modes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
sidebar_position: 2
---
# Legacy Metric Modes
# Standard Metric Modes

Retina provides **three modes** with their own metrics and scale capabilities.
Each mode is **fully customizable** (only create the metrics/labels you need).
Expand Down
4 changes: 2 additions & 2 deletions docs/04-Captures/managed-storage-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SUBSCRIPTION_ID=""
RESOURCE_GROUP_NAME=""
REGION=""
MSI_CLIENT_ID=""
helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
--set operator.enabled=true \
--set capture.enableManagedStorageAccount=true \
--set capture.tenantId=$TENANT_ID \
Expand Down Expand Up @@ -68,7 +68,7 @@ data:
azureCredentialConfig: /etc/kubernetes/cloud-config/azure.json
```

In the above configuration, when `enableManagedStorageAccount` is true, retina-operator will pick azure credential configuration from `/etc/kubernetes/cloud-config/azure.json`. [retina-operator helm template](https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/templates/operator.yaml) mounts the secret containing azure credentials to `/etc/kubernetes/cloud-config/azure.json`.
In the above configuration, when `enableManagedStorageAccount` is true, retina-operator will pick azure credential configuration from `/etc/kubernetes/cloud-config/azure.json`. [retina-operator helm template](https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/templates/operator.yaml) mounts the secret containing azure credentials to `/etc/kubernetes/cloud-config/azure.json`.

When default storage account is enabled, a managed storage account will be created under the resource group of the sub both specified in the credential file.
In the case of AKS, the resource group will be MC, or node, resource group, and subscription will be the overlay subscription.
Expand Down
2 changes: 1 addition & 1 deletion docs/05-Concepts/CRDs/Capture.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ To use the `Capture` CRD, [install Retina](../../02-Installation/01-Setup.md) wi

## CRD Specification

The full specification for the `Capture` CRD can be found in the [Capture CRD](https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_captures.yaml) file.
The full specification for the `Capture` CRD can be found in the [Capture CRD](https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_captures.yaml) file.

The `Capture` CRD is defined with the following specifications:

Expand Down
2 changes: 1 addition & 1 deletion docs/05-Concepts/CRDs/MetricsConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Retina by default emits node level metrics, however, customers can apply `Metric

## CRD Specification

The full specification for the `MetricsConfiguration` CRD can be found in the [MetricsConfiguration CRD](https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml) file.
The full specification for the `MetricsConfiguration` CRD can be found in the [MetricsConfiguration CRD](https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml) file.

The `MetricsConfiguration` CRD is defined with the following specifications:

Expand Down
2 changes: 1 addition & 1 deletion docs/05-Concepts/CRDs/RetinaEndpoint.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ In large-scale API servers, each Retina Pod needs to learn about cluster state,

## CRD Specification

The full specification for the `RetinaEndpoint` CRD can be found in the [RetinaEndpoint CRD]( https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml) file.
The full specification for the `RetinaEndpoint` CRD can be found in the [RetinaEndpoint CRD]( https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml) file.

The `RetinaEndpoint` CRD is defined with the following specifications:

Expand Down
4 changes: 2 additions & 2 deletions operator/cmd/cilium-crds/cells_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ var (
// Provides Clientset, API for accessing Kubernetes objects.
k8sClient.Cell,

// Provides the modular metrics registry, metric HTTP server and legacy metrics cell.
// Provides the modular metrics registry, metric HTTP server and standard metrics cell.
// NOTE: no server/metrics are created when --enable-metrics=false (default)
operatorMetrics.Cell,
cell.Provide(func(
Expand Down Expand Up @@ -175,7 +175,7 @@ var (
// isLeader.Load,
// ),

// NOTE: might need to uncomment to support metrics? Code might be legacy though?
// NOTE: might need to uncomment to support metrics? Code might be standard though?
// api.MetricsHandlerCell,

controller.Cell,
Expand Down
4 changes: 2 additions & 2 deletions operator/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"os"

"github.com/microsoft/retina/operator/cmd/legacy"
"github.com/microsoft/retina/operator/cmd/standard"
"github.com/spf13/cobra"
)

Expand All @@ -27,7 +27,7 @@ var (
Long: "Start Retina Operator",
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("Starting Retina Operator")
d := legacy.NewOperator(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
d := standard.NewOperator(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
d.Start()
},
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

package legacy
package standard

import (
"context"
Expand Down Expand Up @@ -29,7 +29,7 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

retinav1alpha1 "github.com/microsoft/retina/crd/api/v1alpha1"
deploy "github.com/microsoft/retina/deploy/legacy"
deploy "github.com/microsoft/retina/deploy/standard"
"github.com/microsoft/retina/internal/buildinfo"
"github.com/microsoft/retina/operator/cache"
config "github.com/microsoft/retina/operator/config"
Expand Down Expand Up @@ -84,7 +84,7 @@ func NewOperator(metricsAddr, probeAddr, configFile string, enableLeaderElection
func (o *Operator) Start() {
mainLogger = log.Logger().Named("main")

mainLogger.Sugar().Infof("Starting legacy operator")
mainLogger.Sugar().Infof("Starting standard operator")

opts := &crzap.Options{
Development: false,
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/daemon/retinaendpoint/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var _ = BeforeSuite(func() {

By("Bootstrapping test environment")
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "deploy", "legacy", "manifests", "controller", "helm", "retina", "crds")},
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "deploy", "standard", "manifests", "controller", "helm", "retina", "crds")},
ErrorIfCRDPathMissing: true,
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/operator/capture/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var _ = BeforeSuite(func() {

By("Bootstrapping test environment")
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "deploy", "legacy", "manifests", "controller", "helm", "retina", "crds")},
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "deploy", "standard", "manifests", "controller", "helm", "retina", "crds")},
ErrorIfCRDPathMissing: true,
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/monitoragent/monitoragent_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (a *monitorAgent) SendEvent(typ int, event interface{}) error {
return nil
}

// marshal notifications into JSON format for legacy listeners
// marshal notifications into JSON format for standard listeners
if typ == api.MessageTypeAgent {
msg, ok := event.(api.AgentNotifyMessage)
if !ok {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var (

var (
RetinaChartPath = func(rootDir string) string {
return filepath.Join(rootDir, "deploy", "legacy", "manifests", "controller", "helm", "retina")
return filepath.Join(rootDir, "deploy", "standard", "manifests", "controller", "helm", "retina")
}
RetinaAdvancedProfilePath = func(rootDir string) string {
return filepath.Join(rootDir, "test", "profiles", "advanced", "values.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/profiles/localctx/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
operator:
enabled: false
# Plugins will default to deploy/legacy/manifests/controller/helm/retina/values.yaml
# Plugins will default to deploy/standard/manifests/controller/helm/retina/values.yaml
# TODO add all plugins that we want to test here for local context.
remoteContext: false
enablePodLevel: true
Expand Down
2 changes: 1 addition & 1 deletion windows/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
1. Cordon all windows nodes. Until the below selector is added, needed so helm install isn't blocked.
2. Install Linux Retina helm chart.

`helm install retina ./deploy/legacy/manifests/controller/helm/retina/ --namespace kube-system`
`helm install retina ./deploy/standard/manifests/controller/helm/retina/ --namespace kube-system`

3. Uncordon the Windows and nodes.

Expand Down

0 comments on commit c87f650

Please sign in to comment.