merge main

Author: sgalsaleh

.cursor/BUGBOT.md

@@ -0,0 +1,15 @@
+# Embedded Cluster Bugbot Rules
+
+This file provides project-specific guidance for AI code reviews in the Embedded Cluster repository.
+
+## Documentation Reference
+
+For comprehensive development guidance, coding standards, and project architecture, refer to the detailed documentation in the `.cursor/rules/` directory, including:
+
+- **[Project Overview](file://.cursor/rules/project-overview.mdc)** - Complete project description, technology stack, and architecture
+- **[Go Best Practices](file://.cursor/rules/go-best-practices.mdc)** - Go coding standards, patterns, and conventions
+- **[Go Testing](file://.cursor/rules/go-testing.mdc)** - Testing patterns, mock usage, and test organization
+- **[Go API Architecture](file://.cursor/rules/go-ec-api-architecture.mdc)** - API implementation guidelines and patterns
+- **[Frontend Rules](file://.cursor/rules/frontend-rules.mdc)** - React/TypeScript standards and testing patterns
+- **[Clean Code](file://.cursor/rules/clean-code.mdc)** - Code formatting and comment standards
+- **[Code Quality Checks](file://.cursor/rules/code-quality-checks.mdc)** - Essential quality checks to run after changes

.github/workflows/ci.yaml

@@ -84,15 +84,45 @@ jobs:
         run: |
           make unit-tests
 
+  should-run-int-tests-kind:
+    name: Should run integration tests (kind)
+    runs-on: ubuntu-latest
+    outputs:
+      run: ${{ steps.changed-files.outputs.any_changed }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/[email protected]
+        with:
+          files: |
+            kinds/**
+            pkg/**
+            pkg-new/**
+            tests/integration/**
+
   int-tests:
     name: Integration tests
     runs-on: ubuntu-latest
     needs:
       - int-tests-api
       - int-tests-kind
       - int-tests-kind-ha-registry
+    if: ${{ !cancelled() }}
     steps:
-      - name: Succeed if all tests passed
+      # https://docs.github.com/en/actions/learn-github-actions/contexts#needs-context
+      - name: fail if int-tests-api job was not successful
+        if: needs.int-tests-api.result != 'success' && needs.int-tests-api.result != 'skipped'
+        run: exit 1
+      - name: fail if int-tests-kind job was not successful
+        if: needs.int-tests-kind.result != 'success' && needs.int-tests-kind.result != 'skipped'
+        run: exit 1
+      - name: fail if int-tests-kind-ha-registry job was not successful
+        if: needs.int-tests-kind-ha-registry.result != 'success' && needs.int-tests-kind-ha-registry.result != 'skipped'
+        run: exit 1
+      - name: succeed if everything else passed
         run: echo "Integration tests succeeded"
 
   int-tests-api:
@@ -117,6 +147,7 @@ jobs:
   int-tests-kind:
     name: Integration tests (kind)
     runs-on: ubuntu-latest
+    if: needs.should-run-int-tests-kind.outputs.run == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -139,6 +170,7 @@ jobs:
   int-tests-kind-ha-registry:
     name: Integration tests (kind) HA registry
     runs-on: ubuntu-latest
+    if: needs.should-run-int-tests-kind.outputs.run == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -248,7 +280,7 @@ jobs:
     name: Should run e2e
     runs-on: ubuntu-latest
     outputs:
-      run-e2e: ${{ steps.changed-files.outputs.any_changed }}
+      run: ${{ steps.changed-files.outputs.any_changed }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -284,7 +316,7 @@ jobs:
     needs:
       - git-sha
       - should-run-e2e
-    if: needs.should-run-e2e.outputs.run-e2e == 'true'
+    if: needs.should-run-e2e.outputs.run == 'true'
     outputs:
       k0s_version: ${{ steps.export.outputs.k0s_version }}
     steps:
@@ -365,7 +397,7 @@ jobs:
     needs:
       - git-sha
       - should-run-e2e
-    if: needs.should-run-e2e.outputs.run-e2e == 'true'
+    if: needs.should-run-e2e.outputs.run == 'true'
     outputs:
       k0s_version: ${{ steps.export.outputs.k0s_version }}
     steps:
@@ -447,7 +479,7 @@ jobs:
     needs:
       - git-sha
       - should-run-e2e
-    if: needs.should-run-e2e.outputs.run-e2e == 'true'
+    if: needs.should-run-e2e.outputs.run == 'true'
     outputs:
       ec_version: ${{ steps.export.outputs.ec_version }}
       k0s_version: ${{ steps.export.outputs.k0s_version }}
@@ -483,7 +515,7 @@ jobs:
     needs:
       - git-sha
       - should-run-e2e
-    if: needs.should-run-e2e.outputs.run-e2e == 'true'
+    if: needs.should-run-e2e.outputs.run == 'true'
     outputs:
       k0s_version: ${{ steps.export.outputs.k0s_version }}
     steps:
@@ -604,7 +636,7 @@ jobs:
     needs:
       - git-sha
       - should-run-e2e
-    if: needs.should-run-e2e.outputs.run-e2e == 'true'
+    if: needs.should-run-e2e.outputs.run == 'true'
     outputs:
       version_specifier: ${{ steps.export-version-specifier.outputs.version_specifier }}
     steps:
@@ -964,6 +996,9 @@ jobs:
     name: Validate success # this name is used by .github/workflows/automated-prs-manager.yaml
     runs-on: ubuntu-latest
     needs:
+      - build-current
+      - build-previous-k0s
+      - build-upgrade
       - e2e
       - e2e-main
       - e2e-docker
@@ -987,6 +1022,15 @@ jobs:
       - name: fail if e2e-docker job was not successful
         if: needs.e2e-docker.result != 'success' && needs.e2e-docker.result != 'skipped'
         run: exit 1
+      - name: fail if build-current job was not successful
+        if: needs.build-current.result != 'success' && needs.build-current.result != 'skipped'
+        run: exit 1
+      - name: fail if build-previous-k0s job was not successful
+        if: needs.build-previous-k0s.result != 'success' && needs.build-previous-k0s.result != 'skipped'
+        run: exit 1
+      - name: fail if build-upgrade job was not successful
+        if: needs.build-upgrade.result != 'success' && needs.build-upgrade.result != 'skipped'
+        run: exit 1
       - name: fail if sanitize job was not successful
         if: needs.sanitize.result != 'success'
         run: exit 1

.github/workflows/dependencies.yaml

@@ -26,10 +26,17 @@ jobs:
       run: |
         # Remove the '-ec.X' suffix and only update if the prefix (upstream k0s release) has changed.
         export CURVERSION=$(make print-K0S_VERSION)
-        export VERSION=$(gh release list --repo k0sproject/k0s --json name,isLatest | jq -r '.[] | select(.isLatest)|.name')
+        export CURMAJMIN=$(echo $CURVERSION | awk -F'.' '{print $1 "." $2}')
+
+        # pin to the latest release for the current major.minor version
+        export VERSION=$(gh release list --repo k0sproject/k0s --exclude-pre-releases --json name,isLatest | \
+          jq -r "[.[] | select(.name | startswith(\"$CURMAJMIN\"))] | first | .name")
+
         if [ "$CURVERSION" != "$VERSION" ]; then
           sed -i "/^K0S_VERSION/c\K0S_VERSION = $VERSION" Makefile
-          sed -i "/^K0S_BINARY_SOURCE_OVERRIDE/c\K0S_BINARY_SOURCE_OVERRIDE =" Makefile
+          sed -i "/^K0S_GO_VERSION/c\K0S_GO_VERSION = $VERSION" Makefile
+          # replace the first occurrence of K0S_BINARY_SOURCE_OVERRIDE
+          sed -i '0,/K0S_BINARY_SOURCE_OVERRIDE =.*/s/K0S_BINARY_SOURCE_OVERRIDE =.*/K0S_BINARY_SOURCE_OVERRIDE =/' Makefile
           make go.mod
         fi
     - name: Troubleshoot

GEMINI.md

@@ -0,0 +1,15 @@
+# GEMINI.md
+
+This file provides guidance to Gemini when working with code in this repository.
+
+## Documentation Reference
+
+For comprehensive development guidance, coding standards, and project architecture, refer to the detailed documentation in the `.cursor/rules/` directory, including but not limited to:
+
+- **[Project Overview](file://.cursor/rules/project-overview.mdc)** - Complete project description, technology stack, and architecture
+- **[Go Best Practices](file://.cursor/rules/go-best-practices.mdc)** - Go coding standards, patterns, and conventions
+- **[Go Testing](file://.cursor/rules/go-testing.mdc)** - Testing patterns, mock usage, and test organization
+- **[Go API Architecture](file://.cursor/rules/go-ec-api-architecture.mdc)** - API implementation guidelines and patterns
+- **[Frontend Rules](file://.cursor/rules/frontend-rules.mdc)** - React/TypeScript standards and testing patterns
+- **[Clean Code](file://.cursor/rules/clean-code.mdc)** - Code formatting and comment standards
+- **[Code Quality Checks](file://.cursor/rules/code-quality-checks.mdc)** - Essential quality checks to run after changes

Makefile

@@ -15,7 +15,7 @@ K0S_GO_VERSION = v1.30.9+k0s.0
 PREVIOUS_K0S_VERSION ?= v1.29.9+k0s.0-ec.0
 PREVIOUS_K0S_GO_VERSION ?= v1.29.9+k0s.0
 K0S_BINARY_SOURCE_OVERRIDE =
-TROUBLESHOOT_VERSION = v0.120.3
+TROUBLESHOOT_VERSION = v0.121.2
 
 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)(-ec\.[0-9]+)?.*/\1\2/')
 # If KOTS_BINARY_URL_OVERRIDE is set to a ttl.sh artifact, there's NO need to update the KOTS_VERSION above as it will be dynamically generated
@@ -202,7 +202,7 @@ initial-release: check-env-EC_VERSION check-env-APP_VERSION
 
 .PHONY: rebuild-release
 rebuild-release: export EC_VERSION = $(VERSION)-$(CURRENT_USER)
-rebuild-release: export RELEASE_YAML_DIR = e2e/kots-release-install
+rebuild-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-install-v3,e2e/kots-release-install)
 rebuild-release: check-env-EC_VERSION check-env-APP_VERSION
 	UPLOAD_BINARIES=0 \
 	SKIP_RELEASE=1 \

api/client/client.go

@@ -16,7 +16,6 @@ type Client interface {
 	ConfigureLinuxInstallation(config types.LinuxInstallationConfig) (types.Status, error)
 	SetupLinuxInfra(ignoreHostPreflights bool) (types.Infra, error)
 	GetLinuxInfraStatus() (types.Infra, error)
-	GetLinuxAppConfig() (types.AppConfig, error)
 	GetLinuxAppConfigValues() (types.AppConfigValues, error)
 	PatchLinuxAppConfigValues(types.AppConfigValues) (types.AppConfigValues, error)
 	TemplateLinuxAppConfig(values types.AppConfigValues) (types.AppConfig, error)
@@ -26,7 +25,6 @@ type Client interface {
 	GetKubernetesInstallationStatus() (types.Status, error)
 	SetupKubernetesInfra() (types.Infra, error)
 	GetKubernetesInfraStatus() (types.Infra, error)
-	GetKubernetesAppConfig() (types.AppConfig, error)
 	GetKubernetesAppConfigValues() (types.AppConfigValues, error)
 	PatchKubernetesAppConfigValues(types.AppConfigValues) (types.AppConfigValues, error)
 	TemplateKubernetesAppConfig(values types.AppConfigValues) (types.AppConfig, error)

api/client/client_test.go

@@ -585,128 +585,6 @@ func TestErrorFromResponse(t *testing.T) {
 	assert.Contains(t, err.Error(), "unexpected response")
 }
 
-func TestLinuxGetAppConfig(t *testing.T) {
-	// Define expected config once
-	expectedConfig := types.AppConfig{
-		Groups: []kotsv1beta1.ConfigGroup{
-			{
-				Name:  "test-group",
-				Title: "Test Group",
-				Items: []kotsv1beta1.ConfigItem{
-					{
-						Name:    "test-item",
-						Type:    "text",
-						Title:   "Test Item",
-						Default: multitype.FromString("default"),
-						Value:   multitype.FromString("value"),
-					},
-				},
-			},
-		},
-	}
-
-	// Create a test server
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "GET", r.Method)
-		assert.Equal(t, "/api/linux/install/app/config", r.URL.Path)
-
-		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
-		assert.Equal(t, "Bearer test-token", r.Header.Get("Authorization"))
-
-		// Return successful response
-		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(expectedConfig)
-	}))
-	defer server.Close()
-
-	// Test successful get
-	c := New(server.URL, WithToken("test-token"))
-	config, err := c.GetLinuxAppConfig()
-	assert.NoError(t, err)
-	assert.Equal(t, expectedConfig, config)
-
-	// Test error response
-	errorServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusInternalServerError)
-		json.NewEncoder(w).Encode(types.APIError{
-			StatusCode: http.StatusInternalServerError,
-			Message:    "Internal Server Error",
-		})
-	}))
-	defer errorServer.Close()
-
-	c = New(errorServer.URL, WithToken("test-token"))
-	config, err = c.GetLinuxAppConfig()
-	assert.Error(t, err)
-	assert.Equal(t, types.AppConfig{}, config)
-
-	apiErr, ok := err.(*types.APIError)
-	require.True(t, ok, "Expected err to be of type *types.APIError")
-	assert.Equal(t, http.StatusInternalServerError, apiErr.StatusCode)
-	assert.Equal(t, "Internal Server Error", apiErr.Message)
-}
-
-func TestKubernetesGetAppConfig(t *testing.T) {
-	// Define expected config once
-	expectedConfig := types.AppConfig{
-		Groups: []kotsv1beta1.ConfigGroup{
-			{
-				Name:  "test-group",
-				Title: "Test Group",
-				Items: []kotsv1beta1.ConfigItem{
-					{
-						Name:    "test-item",
-						Type:    "text",
-						Title:   "Test Item",
-						Default: multitype.FromString("default"),
-						Value:   multitype.FromString("value"),
-					},
-				},
-			},
-		},
-	}
-
-	// Create a test server
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "GET", r.Method)
-		assert.Equal(t, "/api/kubernetes/install/app/config", r.URL.Path)
-
-		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
-		assert.Equal(t, "Bearer test-token", r.Header.Get("Authorization"))
-
-		// Return successful response
-		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(expectedConfig)
-	}))
-	defer server.Close()
-
-	// Test successful get
-	c := New(server.URL, WithToken("test-token"))
-	config, err := c.GetKubernetesAppConfig()
-	assert.NoError(t, err)
-	assert.Equal(t, expectedConfig, config)
-
-	// Test error response
-	errorServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusInternalServerError)
-		json.NewEncoder(w).Encode(types.APIError{
-			StatusCode: http.StatusInternalServerError,
-			Message:    "Internal Server Error",
-		})
-	}))
-	defer errorServer.Close()
-
-	c = New(errorServer.URL, WithToken("test-token"))
-	config, err = c.GetKubernetesAppConfig()
-	assert.Error(t, err)
-	assert.Equal(t, types.AppConfig{}, config)
-
-	apiErr, ok := err.(*types.APIError)
-	require.True(t, ok, "Expected err to be of type *types.APIError")
-	assert.Equal(t, http.StatusInternalServerError, apiErr.StatusCode)
-	assert.Equal(t, "Internal Server Error", apiErr.Message)
-}
-
 func TestLinuxGetAppConfigValues(t *testing.T) {
 	// Define expected values once
 	expectedValues := types.AppConfigValues{