chore(ci): fix dependency update job (#2819)

* chore(ci): fix dependency update job

* Update Makefile versions (#2820)

Co-authored-by: emosbaugh <[email protected]>

* f

* f

* f

---------

Co-authored-by: replicated-ci-ec <[email protected]>
Co-authored-by: emosbaugh <[email protected]>

Author: emosbaugh

.github/workflows/dependencies.yaml

@@ -13,13 +13,15 @@ jobs:
   update-dependencies:
     runs-on: ubuntu-latest
     steps:
-    - name: Check out repo
+    - name: Checkout
       uses: actions/checkout@v5
-    - name: Set up Go
+
+    - name: Setup go
       uses: actions/setup-go@v6
       with:
         go-version-file: go.mod
         cache-dependency-path: "**/*.sum"
+
     - name: K0s
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -31,20 +33,42 @@ jobs:
         echo "k0s minor version: $K0S_MINOR_VERSION"
         ./scripts/k0s-update-dependencies.sh "$K0S_MINOR_VERSION" \
           UPDATE_ALL_IMAGES=true
+
     - name: Troubleshoot
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         version=$(gh release list --repo replicatedhq/troubleshoot --json name,isLatest | jq -r '.[] | select(.isLatest)|.name')
         echo "troubleshoot version: $version"
         sed -i "/^TROUBLESHOOT_VERSION/c\TROUBLESHOOT_VERSION = $version" versions.mk
+
     - name: FIO
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        version=$(gh release list --repo axboe/fio --json name,isLatest | jq -r '.[] | select(.isLatest)|.name' | cut -d- -f2)
+        version=$(gh release list --repo axboe/fio --json name,isLatest | jq -r '.[] | select(.isLatest)|.name' | grep -oE '[0-9]+\.[0-9]+(\.[0-9]+)?')
         echo "fio version: $version"
         sed -i "/^FIO_VERSION/c\FIO_VERSION = $version" versions.mk
+
+    - name: Controller Tools
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        version=$(gh release list --repo kubernetes-sigs/controller-tools --json name,isLatest | jq -r '.[] | select(.isLatest)|.name')
+        echo "controller-tools version: $version"
+        sed -i "/^CONTROLLER_TOOLS_VERSION/c\CONTROLLER_TOOLS_VERSION = $version" versions.mk
+        # update CRDs
+        make -C kinds generate
+        make -C operator manifests
+
+    - name: Kustomize
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        version=$(gh release list --repo kubernetes-sigs/kustomize --json name,createdAt | jq -r '.[] | select(.name | startswith("kustomize/")) | .name' | head -1 | sed 's/kustomize\///')
+        echo "kustomize version: $version"
+        sed -i "/^KUSTOMIZE_VERSION/c\KUSTOMIZE_VERSION = $version" versions.mk
+
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v7
       with:

Makefile

@@ -274,6 +274,7 @@ envtest: crds
 	$(MAKE) -C operator envtest
 
 .PHONY: unit-tests
+unit-tests: ENVTEST_K8S_VERSION = $(shell echo $(K0S_VERSION) | sed 's/v\([0-9]*\.[0-9]*\)\.[0-9]*.*/\1/')
 unit-tests: envtest
 	KUBEBUILDER_ASSETS="$(shell ./operator/bin/setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(shell pwd)/operator/bin -p path)" \
 		go test -race -tags $(GO_BUILD_TAGS) -v ./pkg/... ./cmd/... ./web/... ./pkg-new/...

api/controllers/linux/install/controller_test.go

@@ -708,17 +708,17 @@ func TestRunHostPreflights(t *testing.T) {
 			sm := NewStateMachine(WithCurrentState(tt.currentState))
 
 			mockPreflightManager := &preflight.MockHostPreflightManager{}
-			mockReporter := &metrics.MockReporter{}
+			mockMetricsReporter := &metrics.MockReporter{}
 			mockStore := &store.MockStore{}
 
-			tt.setupMocks(mockPreflightManager, rc, mockReporter, mockStore)
+			tt.setupMocks(mockPreflightManager, rc, mockMetricsReporter, mockStore)
 
 			controller, err := NewInstallController(
 				WithRuntimeConfig(rc),
 				WithStateMachine(sm),
 				WithHostPreflightManager(mockPreflightManager),
 				WithReleaseData(getTestReleaseData(&kotsv1beta1.Config{})),
-				WithMetricsReporter(mockReporter),
+				WithMetricsReporter(mockMetricsReporter),
 				WithStore(mockStore),
 			)
 			require.NoError(t, err)
@@ -741,11 +741,15 @@ func TestRunHostPreflights(t *testing.T) {
 			}, time.Second, 100*time.Millisecond, "state machine should not be locked")
 
 			mockPreflightManager.AssertExpectations(t)
-			mockReporter.AssertExpectations(t)
 			mockStore.LinuxInfraMockStore.AssertExpectations(t)
 			mockStore.LinuxInstallationMockStore.AssertExpectations(t)
 			mockStore.LinuxPreflightMockStore.AssertExpectations(t)
 			mockStore.AppConfigMockStore.AssertExpectations(t)
+
+			// Wait for the event handler goroutine to complete
+			// TODO: find a better way to do this
+			time.Sleep(1 * time.Second)
+			mockMetricsReporter.AssertExpectations(t)
 		})
 	}
 }

api/integration/linux/install/appinstall_test.go

@@ -184,8 +184,8 @@ func TestPostInstallApp(t *testing.T) {
 		rc.SetDataDir(t.TempDir())
 
 		// Create mock metrics reporter - this is the key test for reporting handlers
-		mockReporter := &metrics.MockReporter{}
-		mockReporter.On("ReportInstallationSucceeded", mock.Anything)
+		mockMetricsReporter := &metrics.MockReporter{}
+		mockMetricsReporter.On("ReportInstallationSucceeded", mock.Anything)
 
 		// Create mock app install manager that succeeds
 		mockAppInstallManager := &appinstallmanager.MockAppInstallManager{}
@@ -220,7 +220,7 @@ func TestPostInstallApp(t *testing.T) {
 		installController, err := linuxinstall.NewInstallController(
 			linuxinstall.WithStateMachine(stateMachine),
 			linuxinstall.WithAppInstallController(appInstallController),
-			linuxinstall.WithMetricsReporter(mockReporter),
+			linuxinstall.WithMetricsReporter(mockMetricsReporter),
 			linuxinstall.WithReleaseData(&release.ReleaseData{
 				EmbeddedClusterConfig: &ecv1beta1.Config{},
 				ChannelRelease: &release.ChannelRelease{
@@ -262,9 +262,13 @@ func TestPostInstallApp(t *testing.T) {
 			return stateMachine.CurrentState() == states.StateSucceeded
 		}, 10*time.Second, 100*time.Millisecond, "state should transition to Succeeded")
 
-		// Verify that ReportInstallationSucceeded was called
-		mockReporter.AssertExpectations(t)
 		mockAppInstallManager.AssertExpectations(t)
+
+		// Wait for the event handler goroutine to complete
+		// TODO: find a better way to do this
+		time.Sleep(1 * time.Second)
+		// Verify that ReportInstallationSucceeded was called
+		mockMetricsReporter.AssertExpectations(t)
 	})
 
 	t.Run("Invalid state transition", func(t *testing.T) {
@@ -319,8 +323,8 @@ func TestPostInstallApp(t *testing.T) {
 		rc.SetDataDir(t.TempDir())
 
 		// Create mock metrics reporter expecting failure report
-		mockReporter := &metrics.MockReporter{}
-		mockReporter.On("ReportInstallationFailed", mock.Anything, mock.MatchedBy(func(err error) bool {
+		mockMetricsReporter := &metrics.MockReporter{}
+		mockMetricsReporter.On("ReportInstallationFailed", mock.Anything, mock.MatchedBy(func(err error) bool {
 			return err.Error() == "install app: installation failed"
 		}))
 
@@ -361,7 +365,7 @@ func TestPostInstallApp(t *testing.T) {
 		installController, err := linuxinstall.NewInstallController(
 			linuxinstall.WithStateMachine(stateMachine),
 			linuxinstall.WithAppInstallController(appInstallController),
-			linuxinstall.WithMetricsReporter(mockReporter),
+			linuxinstall.WithMetricsReporter(mockMetricsReporter),
 			linuxinstall.WithStore(mockStore),
 			linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
 			linuxinstall.WithRuntimeConfig(rc),
@@ -395,10 +399,14 @@ func TestPostInstallApp(t *testing.T) {
 			return stateMachine.CurrentState() == states.StateAppInstallFailed
 		}, 10*time.Second, 100*time.Millisecond, "state should transition to AppInstallFailed")
 
-		// Verify that ReportInstallationFailed was called
-		mockReporter.AssertExpectations(t)
 		mockAppInstallManager.AssertExpectations(t)
 		mockStore.AppInstallMockStore.AssertExpectations(t)
+
+		// Wait for the event handler goroutine to complete
+		// TODO: find a better way to do this
+		time.Sleep(1 * time.Second)
+		// Verify that ReportInstallationFailed was called
+		mockMetricsReporter.AssertExpectations(t)
 	})
 
 	t.Run("Authorization error", func(t *testing.T) {

operator/Makefile

@@ -75,6 +75,7 @@ fmt: ## Run go fmt against code.
 	go fmt ./...
 
 .PHONY: test
+test: ENVTEST_K8S_VERSION = $(shell echo $(K0S_VERSION) | sed 's/v\([0-9]*\.[0-9]*\)\.[0-9]*.*/\1/')
 test: manifests envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -tags $(GO_BUILD_TAGS) ./... -coverprofile cover.out
 

operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     replicated.com/disaster-recovery: infra
     replicated.com/disaster-recovery-chart: embedded-cluster-operator
@@ -259,7 +259,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     replicated.com/disaster-recovery: ec-install
   name: installations.embeddedcluster.replicated.com

operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: configs.embeddedcluster.replicated.com
 spec:
   group: embeddedcluster.replicated.com

operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: installations.embeddedcluster.replicated.com
 spec:
   group: embeddedcluster.replicated.com

operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: kubernetesinstallations.embeddedcluster.replicated.com
 spec:
   group: embeddedcluster.replicated.com

pkg/crds/resources.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     replicated.com/disaster-recovery: infra
     replicated.com/disaster-recovery-chart: embedded-cluster-operator
@@ -259,7 +259,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     replicated.com/disaster-recovery: ec-install
   name: installations.embeddedcluster.replicated.com