Automated merge

* upstream/main:
  Add spec.values.global.platform to IstioCNI (openshift-service-mesh#443)
  Include integration tests in code coverage calculation (openshift-service-mesh#427)
  Improve failure messages for supportedversion unit tests (openshift-service-mesh#442)

Author: openshift-service-mesh-bot

.github/workflows/coverage.yaml

@@ -10,12 +10,12 @@ jobs:
 
     - name: Run coverage
       run: |
-        make test.unit \
+        make test \
           -e COVERAGE=true
 
     - name: Upload to Codecov
       uses: codecov/codecov-action@v4
       with:
-        file: out/coverage.out
+        files: out/coverage-unit.out,out/coverage-integration.out
         token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
+        fail_ci_if_error: true

Makefile.core.mk

@@ -71,8 +71,8 @@ ENVTEST_K8S_VERSION ?= 1.29.0
 # Set DOCKER_BUILD_FLAGS to specify flags to pass to 'docker build', default to empty. Example: --platform=linux/arm64
 DOCKER_BUILD_FLAGS ?= "--platform=$(TARGET_OS)/$(TARGET_ARCH)"
 
-GOTEST_FLAGS := $(if $(VERBOSE),-v) $(if $(COVERAGE),-coverprofile=$(REPO_ROOT)/out/coverage.out)
-GINKGO_FLAGS := $(if $(VERBOSE),-v) $(if $(CI),--no-color)
+GOTEST_FLAGS := $(if $(VERBOSE),-v) $(if $(COVERAGE),-coverprofile=$(REPO_ROOT)/out/coverage-unit.out)
+GINKGO_FLAGS := $(if $(VERBOSE),-v) $(if $(CI),--no-color) $(if $(COVERAGE),-coverprofile=coverage-integration.out -coverpkg=./... --output-dir=out)
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

api/v1alpha1/values_types.gen.go

@@ -1392,6 +1392,12 @@ spec:
                               If empty, default scope and level will be used as configured in code
                             type: string
                         type: object
+                      platform:
+                        description: |-
+                          Platform in which Istio is deployed. Possible values are: "openshift" and "gcp"
+                          An empty value means it is a vanilla Kubernetes distribution, therefore no special
+                          treatment will be considered.
+                        type: string
                       tag:
                         description: Specifies the tag for the Istio docker images.
                         type: string

api/v1alpha1/zz_generated.deepcopy.go

@@ -1392,6 +1392,12 @@ spec:
                               If empty, default scope and level will be used as configured in code
                             type: string
                         type: object
+                      platform:
+                        description: |-
+                          Platform in which Istio is deployed. Possible values are: "openshift" and "gcp"
+                          An empty value means it is a vanilla Kubernetes distribution, therefore no special
+                          treatment will be considered.
+                        type: string
                       tag:
                         description: Specifies the tag for the Istio docker images.
                         type: string

bundle/manifests/sailoperator.io_istiocnis.yaml

@@ -139,6 +139,7 @@ _Appears in:_
 | `logging` _[GlobalLoggingConfig](#globalloggingconfig)_ | Specifies the global logging level settings for the Istio control plane components. |  |  |
 | `tag` _string_ | Specifies the tag for the Istio docker images. |  |  |
 | `variant` _string_ | The variant of the Istio container images to use. Options are "debug" or "distroless". Unset will use the default for the given version. |  |  |
+| `platform` _string_ | Platform in which Istio is deployed. Possible values are: "openshift" and "gcp" An empty value means it is a vanilla Kubernetes distribution, therefore no special treatment will be considered. |  |  |
 
 
 #### CNIRepairConfig

chart/crds/sailoperator.io_istiocnis.yaml

@@ -129,6 +129,7 @@ inputFiles:
       - ImagePullSecrets
       - LogAsJson
       - Logging
+      - Platform
       - Tag
       - Variant
     addComments:

docs/api-reference/sailoperator.io.md

@@ -22,11 +22,11 @@ import (
 
 func TestInit(t *testing.T) {
 	// no need to call init(), since it's called automatically
-	assert.True(t, len(List) > 0, "List should not be empty")
-	assert.True(t, len(Map) > 0, "M should not be empty")
-	assert.True(t, Default != "", "Default should not be empty")
-	assert.True(t, Old != "", "Default should not be empty")
-	assert.True(t, New != "", "Default should not be empty")
+	assert.True(t, len(List) > 0, "supportedversion.List should not be empty")
+	assert.True(t, len(Map) > 0, "supportedversion.Map should not be empty")
+	assert.True(t, Default != "", "supportedversion.Default should not be empty")
+	assert.True(t, Old != "", "supportedversion.Old should not be empty")
+	assert.True(t, New != "", "supportedversion.New should not be empty")
 
 	assert.Equal(t, len(List), len(Map), "Map should be same size as List")
 	for _, vi := range List {