Several fixes

Fix Dockerfile entrypoint
Fix some tests referring to old structs

Signed-off-by: Itxaka <[email protected]>

.github/workflows/e2e.yaml

@@ -85,7 +85,6 @@ jobs:
           go-version: '^1.17'
       - name: Deps
         run: |
-          ip a
           make test_deps
       - uses: engineerd/[email protected]
         with:

Dockerfile

@@ -9,7 +9,8 @@ COPY cmd /src/cmd
 # Set arg/env after go mod download, otherwise we invalidate the cached layers due to the commit changing easily
 ARG VERSION=0.0.0
 ENV VERSION=${VERSION}
-RUN go build -ldflags "-extldflags -static -s -X 'github.com/rancher/elemental-operator/version.Version=$(VERSION)'" -o /usr/sbin/rancheros-operator
+RUN go build -ldflags "-extldflags -static -s -X github.com/rancher/elemental-operator/version.Version=$VERSION" -o /usr/sbin/elemental-operator
 
-FROM scratch as ros-operator
-COPY --from=build /usr/sbin/rancheros-operator /usr/sbin/rancheros-operator
+FROM scratch as elemental-operator
+COPY --from=build /usr/sbin/elemental-operator /usr/sbin/elemental-operator
+ENTRYPOINT ["/usr/sbin/elemental-operator"]

Makefile

@@ -2,7 +2,7 @@ GIT_COMMIT?=$(shell git rev-parse HEAD)
 GIT_COMMIT_SHORT?=$(shell git rev-parse --short HEAD)
 GIT_TAG?=$(shell git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0" )
 TAG?=${GIT_TAG}-${GIT_COMMIT_SHORT}
-REPO?=rancher/elemental-operator
+REPO?=rancher/elemental-operator-ci
 export ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 CHART?=$(shell find $(ROOT_DIR) -type f  -name "elemental-operator*.tgz" -print)
 CHART_VERSION?=$(subst v,,$(GIT_TAG))

tests/catalog/machineregistration.go

@@ -16,28 +16,24 @@ limitations under the License.
 
 package catalog
 
+import v1beta1 "github.com/rancher/elemental-operator/pkg/apis/elemental.cattle.io/v1beta1"
+
 type MachineRegistration struct {
 	APIVersion string `json:"apiVersion" yaml:"apiVersion"`
 	Kind       string `json:"kind" yaml:"kind"`
 	Metadata   struct {
 		Name string `json:"name" yaml:"name"`
 	} `json:"metadata" yaml:"metadata"`
-	Spec struct {
-		CloudConfig map[string]interface{} `json:"cloudConfig" yaml:"cloudConfig"`
-	} `json:"spec" yaml:"spec"`
+	Spec v1beta1.MachineRegistrationSpec `json:"spec" yaml:"spec"`
 }
 
-func NewMachineRegistration(name string, cloudConfig map[string]interface{}) *MachineRegistration {
+func NewMachineRegistration(name string, spec v1beta1.MachineRegistrationSpec) *MachineRegistration {
 	return &MachineRegistration{
-		APIVersion: "rancheros.cattle.io/v1",
+		APIVersion: "elemental.cattle.io/v1beta1",
 		Metadata: struct {
 			Name string "json:\"name\" yaml:\"name\""
 		}{Name: name},
 		Kind: "MachineRegistration",
-		Spec: struct {
-			CloudConfig map[string]interface{} "json:\"cloudConfig\" yaml:\"cloudConfig\""
-		}{
-			CloudConfig: cloudConfig,
-		},
+		Spec: spec,
 	}
 }

tests/catalog/managedosimage.go

@@ -42,15 +42,15 @@ type ManagedOSImage struct {
 		Drain                *DrainSpec               `json:"drain,omitempty" yaml:"drain"`
 		OSImage              string                   `json:"osImage" yaml:"osImage"`
 		ManagedOSVersionName string                   `json:"managedOSVersionName" yaml:"managedOSVersionName"`
-		ClusterTargets       []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
+		Targets              []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
 	}
 }
 
-func NewManagedOSImage(name string, clusterTargets []map[string]interface{}, mosImage string, mosVersionName string) *ManagedOSImage {
+func NewManagedOSImage(name string, targets []map[string]interface{}, mosImage string, mosVersionName string) *ManagedOSImage {
 	cordon := false
 
 	return &ManagedOSImage{
-		APIVersion: "rancheros.cattle.io/v1",
+		APIVersion: "elemental.cattle.io/v1beta1",
 		Metadata: struct {
 			Name string "json:\"name\" yaml:\"name\""
 		}{Name: name},
@@ -60,20 +60,20 @@ func NewManagedOSImage(name string, clusterTargets []map[string]interface{}, mos
 			Drain                *DrainSpec               `json:"drain,omitempty" yaml:"drain"`
 			OSImage              string                   `json:"osImage" yaml:"osImage"`
 			ManagedOSVersionName string                   `json:"managedOSVersionName" yaml:"managedOSVersionName"`
-			ClusterTargets       []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
+			Targets              []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
 		}{
 			OSImage:              mosImage,
 			ManagedOSVersionName: mosVersionName,
 			Cordon:               &cordon,
-			ClusterTargets:       clusterTargets,
+			Targets:              targets,
 		},
 	}
 }
 
 func DrainOSImage(name string, managedOSVersion string, drainSpec *DrainSpec) *ManagedOSImage {
 	cordon := false
 	return &ManagedOSImage{
-		APIVersion: "rancheros.cattle.io/v1",
+		APIVersion: "elemental.cattle.io/v1beta1",
 		Metadata: struct {
 			Name string "json:\"name\" yaml:\"name\""
 		}{Name: name},
@@ -83,7 +83,7 @@ func DrainOSImage(name string, managedOSVersion string, drainSpec *DrainSpec) *M
 			Drain                *DrainSpec               `json:"drain,omitempty" yaml:"drain"`
 			OSImage              string                   `json:"osImage" yaml:"osImage"`
 			ManagedOSVersionName string                   `json:"managedOSVersionName" yaml:"managedOSVersionName"`
-			ClusterTargets       []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
+			Targets              []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
 		}{
 			Cordon:               &cordon,
 			ManagedOSVersionName: managedOSVersion,

tests/catalog/managedosversion.go

@@ -41,7 +41,7 @@ type ContainerSpec struct {
 
 func NewManagedOSVersion(name string, version string, minVersion string, metadata map[string]interface{}, upgradeC *ContainerSpec) *ManagedOSVersion {
 	return &ManagedOSVersion{
-		APIVersion: "rancheros.cattle.io/v1",
+		APIVersion: "elemental.cattle.io/v1beta1",
 		Metadata: struct {
 			Name string "json:\"name\" yaml:\"name\""
 		}{Name: name},

tests/catalog/managedosversionchannel.go

@@ -33,7 +33,7 @@ type ManagedOSVersionChannel struct {
 
 func NewManagedOSVersionChannel(name string, t string, options map[string]interface{}, upgradeContainer *ContainerSpec) *ManagedOSVersionChannel {
 	return &ManagedOSVersionChannel{
-		APIVersion: "rancheros.cattle.io/v1",
+		APIVersion: "elemental.cattle.io/v1beta1",
 		Metadata: struct {
 			Name string "json:\"name\" yaml:\"name\""
 		}{Name: name},

tests/e2e/e2e_suite_test.go

@@ -19,18 +19,16 @@ package e2e_test
 import (
 	"bytes"
 	"fmt"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	kubectl "github.com/rancher-sandbox/ele-testhelpers/kubectl"
+	"github.com/rancher/elemental-operator/tests/catalog"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
 	"testing"
-	"time"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	kubectl "github.com/rancher-sandbox/ele-testhelpers/kubectl"
-	"github.com/rancher/elemental-operator/tests/catalog"
 )
 
 var (
@@ -54,7 +52,7 @@ func isOperatorInstalled(k *kubectl.Kubectl) bool {
 }
 
 func deployOperator(k *kubectl.Kubectl) {
-	By("Deploying ros-operator chart", func() {
+	By("Deploying elemental-operator chart", func() {
 		err := kubectl.RunHelmBinaryWithCustomErr(
 			"-n", "cattle-elemental-operator-system", "install", "--create-namespace", "elemental-operator", chart)
 		Expect(err).ToNot(HaveOccurred())
@@ -69,15 +67,6 @@ func deployOperator(k *kubectl.Kubectl) {
 		err = k.WaitForNamespaceWithPod("cattle-elemental-operator-system", "app=elemental-operator")
 		Expect(err).ToNot(HaveOccurred())
 
-		Eventually(func() string {
-			str, _ := kubectl.Run("logs", "-n", "cattle-elemental-operator-system", pods[0])
-			fmt.Println(str)
-			return str
-		}, 5*time.Minute, 2*time.Second).Should(
-			And(
-				ContainSubstring("Starting management.cattle.io/v3, Kind=Setting controller"),
-			))
-
 		err = k.ApplyYAML("", "server-url", catalog.NewSetting("server-url", "env", fmt.Sprintf("%s.%s", externalIP, magicDNS)))
 		Expect(err).ToNot(HaveOccurred())
 	})
@@ -114,7 +103,7 @@ var _ = BeforeSuite(func() {
 
 	chart = os.Getenv("CHART")
 	if chart == "" && !isOperatorInstalled(k) {
-		Fail("No CHART provided, a ros operator helm chart is required to run e2e tests")
+		Fail("No CHART provided, a elemental operator helm chart is required to run e2e tests")
 	} else if isOperatorInstalled(k) {
 		//
 		// Upgrade/delete of operator only goes here
@@ -128,7 +117,7 @@ var _ = BeforeSuite(func() {
 
 			deployOperator(k)
 
-			// Somehow rancher needs to be restarted after a ros-operator upgrade
+			// Somehow rancher needs to be restarted after a elemental-operator upgrade
 			// to get machineregistration working
 			pods, err := k.GetPodNames("cattle-system", "")
 			Expect(err).ToNot(HaveOccurred())
@@ -155,7 +144,7 @@ var _ = BeforeSuite(func() {
 		}
 		return false
 	}
-	By("Deploying ros-operator chart dependencies", func() {
+	By("Deploying elemental-operator chart dependencies", func() {
 		By("installing nginx", func() {
 			if installed("ingress-nginx") {
 				By("already installed")

tests/e2e/machineregistration_test.go

@@ -25,6 +25,8 @@ import (
 	http "github.com/rancher-sandbox/ele-testhelpers/http"
 	kubectl "github.com/rancher-sandbox/ele-testhelpers/kubectl"
 
+	"github.com/rancher/elemental-operator/pkg/apis/elemental.cattle.io/v1beta1"
+	"github.com/rancher/elemental-operator/pkg/installer"
 	"github.com/rancher/elemental-operator/tests/catalog"
 )
 
@@ -37,17 +39,8 @@ var _ = Describe("MachineRegistration e2e tests", func() {
 		})
 
 		It("creates a machine registration resource and a URL attaching CA certificate", func() {
-			mr := catalog.NewMachineRegistration("machine-registration", map[string]interface{}{
-				"install":   map[string]string{"device": "/dev/vda"},
-				"rancheros": map[string]interface{}{"install": map[string]string{"isoUrl": "https://something.example.com"}},
-				"users": []map[string]string{
-					{
-						"name":   "root",
-						"passwd": "root",
-					},
-				},
-			})
-
+			spec := v1beta1.MachineRegistrationSpec{Install: &installer.Install{Device: "/dev/vda", ISO: "https://something.example.com"}}
+			mr := catalog.NewMachineRegistration("machine-registration", spec)
 			Eventually(func() error {
 				return k.ApplyYAML("fleet-default", "machine-registration", mr)
 			}, 2*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())

tests/e2e/managedosimage_test.go

@@ -83,7 +83,7 @@ var _ = Describe("ManagedOSImage e2e tests", func() {
 
 			EventuallyWithOffset(1, func() error {
 				return k.ApplyYAML("fleet-default", osVersion, ov)
-			}, 2*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
+			}, 1*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
 
 			ui := catalog.NewManagedOSImage(
 				osImage,
@@ -94,7 +94,7 @@ var _ = Describe("ManagedOSImage e2e tests", func() {
 
 			EventuallyWithOffset(1, func() error {
 				return k.ApplyYAML("fleet-default", osImage, ui)
-			}, 2*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
+			}, 1*time.Minute, 2*time.Second).ShouldNot(HaveOccurred())
 
 			EventuallyWithOffset(1, func() string {
 				r, err := kubectl.GetData("fleet-default", "bundle", "mos-update-osversion", `jsonpath={.spec.resources[*].content}`)

tests/e2e/managedosversionchannel_test.go

@@ -72,7 +72,7 @@ var _ = Describe("ManagedOSVersionChannel e2e tests", func() {
 			)
 		})
 
-		It("creates a list of ManagedOSVersion from a JSON server", func() {
+		It("creates a list of ManagedOSVersion from a JSON server", Focus, func() {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
@@ -137,7 +137,7 @@ var _ = Describe("ManagedOSVersionChannel e2e tests", func() {
 				}
 
 				return string(r)
-			}, 1*time.Minute, 2*time.Second).Should(
+			}, 5*time.Minute, 2*time.Second).Should(
 				Equal("registry.com/repository/image:v1"),
 			)
 

tests/e2e/upgrades_test.go

@@ -77,7 +77,7 @@ func checkUpgradePod(k *kubectl.Kubectl, env, image, command, args, mm types.Gom
 		cattleNamespace,
 		"upgrade.cattle.io/controller=system-upgrade-controller",
 		3*time.Minute, 2*time.Second,
-		ContainElement(ContainSubstring("apply-os-upgrader-on-ros-e2e-control-plane-with")),
+		ContainElement(ContainSubstring("apply-os-upgrader-on-operator-e2e-control-plane-with")),
 	)
 
 	podName := upgradePod(k)