Skip to content

Commit 47e97bf

Browse files
committed
daemon.go: Change the Daemon to retrieve a set of Flavours instead of a single flavor
- Retrieving a set of flavours lets us match cases well such as being able to differentiate if something is microshift + RHEL For Edge or Openshift + Classic RHEL. (Basically able to match multiple flavours)
1 parent 5ed6581 commit 47e97bf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

internal/daemon/daemon.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ func NewDaemon(mode string, client client.Client, scheme *runtime.Scheme, vspIma
6767

6868
func (d *Daemon) Run() error {
6969
ce := utils.NewClusterEnvironment(d.client)
70-
flavour, err := ce.Flavour(context.TODO())
70+
flavours, err := ce.Flavours(context.TODO())
7171
if err != nil {
7272
return err
7373
}
74-
d.log.Info("Detected OpenShift", "flavour", flavour)
75-
err = d.prepareCni(flavour)
74+
d.log.Info("Detected Flavours", "flavours", flavours)
75+
err = d.prepareCni(flavours)
7676
if err != nil {
7777
return err
7878
}
@@ -88,8 +88,8 @@ func (d *Daemon) Run() error {
8888
return daemon.ListenAndServe()
8989
}
9090

91-
func (d *Daemon) prepareCni(flavour utils.Flavour) error {
92-
cniPath, err := d.pm.CniPath(flavour)
91+
func (d *Daemon) prepareCni(flavours utils.FlavourSet) error {
92+
cniPath, err := d.pm.CniPath(flavours)
9393
if err != nil {
9494
d.log.Error(err, "Failed to get cni path")
9595
return err

0 commit comments

Comments
 (0)