Skip to content

Commit

Permalink
Merge pull request #149 from openshift-service-mesh-bot/none-main-mer…
Browse files Browse the repository at this point in the history
…ge_upstream_main-38a843ce

Automator: merge upstream changes to openshift-service-mesh/sail-operator@main
  • Loading branch information
openshift-merge-bot[bot] authored Oct 21, 2024
2 parents d3b4f6a + 4124962 commit 9e52de9
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha1/values_types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions bundle/manifests/sailoperator.io_istiocnis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions chart/crds/sailoperator.io_istiocnis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/api-reference/sailoperator.io.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions hack/api_transformer/transform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ inputFiles:
- ImagePullSecrets
- LogAsJson
- Logging
- Platform
- Tag
- Variant
addComments:
Expand Down
10 changes: 5 additions & 5 deletions pkg/test/util/supportedversion/supportedversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9e52de9

Please sign in to comment.