Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ci/helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,14 @@ function ci::verify_download_java_function_generic_auth() {
}

function ci::verify_vpa_java_function() {
kubectl wait -l name=function-sample-vpa-function --for=condition=RecommendationProvided --timeout=2m vpa && true
kubectl wait vpa/function-sample-vpa-function --for=condition=RecommendationProvided --timeout=2m || return 1
cpu=`kubectl get vpa function-sample-vpa-function -o jsonpath='{.status.recommendation.containerRecommendations[0].target.cpu}'`
memory=`kubectl get vpa function-sample-vpa-function -o jsonpath='{.status.recommendation.containerRecommendations[0].target.memory}'`
resources='{"limits":{"cpu":"'$cpu'","memory":"'$memory'"},"requests":{"cpu":"'$cpu'","memory":"'$memory'"}}'

# delete pod to trigger resource updating
kubectl delete pod function-sample-vpa-function-0
kubectl wait -l statefulset.kubernetes.io/pod-name=function-sample-vpa-function-0 --for=condition=Ready --timeout=2m pod
kubectl wait -l statefulset.kubernetes.io/pod-name=function-sample-vpa-function-0 --for=condition=Ready --timeout=2m pod || return 1
realResource1=`kubectl get pod function-sample-vpa-function-0 -o jsonpath='{.spec.containers[0].resources}'`
retry=10
if [[ "$resources" != "$realResource1" ]]; then
Expand All @@ -259,7 +259,7 @@ function ci::verify_vpa_java_function() {

# delete pod to trigger resource updating
kubectl delete pod function-sample-vpa-function-1
kubectl wait -l statefulset.kubernetes.io/pod-name=function-sample-vpa-function-0 --for=condition=Ready --timeout=2m pod
kubectl wait -l statefulset.kubernetes.io/pod-name=function-sample-vpa-function-1 --for=condition=Ready --timeout=2m pod || return 1
realResource2=`kubectl get pod function-sample-vpa-function-1 -o jsonpath='{.spec.containers[0].resources}'`
if [[ "$resources" != "$realResource2" ]]; then
echo "vpa tests failed for pod2"
Expand Down
3 changes: 1 addition & 2 deletions .ci/tests/integration-oauth2/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ setup:
image="function-mesh:latest"
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
kind load docker-image ${image}
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.pauseRollout=false --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
wait:
- namespace: function-mesh
resource: pod
Expand All @@ -48,7 +48,6 @@ setup:

- name: install pulsar cluster
command: |
helm repo add streamnative https://charts.streamnative.io
rm -rf pulsar-charts/
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
cd pulsar-charts/
Expand Down
3 changes: 1 addition & 2 deletions .ci/tests/integration-oauth2/e2e_with_downloader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ setup:
image="function-mesh:latest"
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
kind load docker-image ${image}
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.enableInitContainers=true --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.pauseRollout=false --set controllerManager.enableInitContainers=true --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
wait:
- namespace: function-mesh
resource: pod
Expand All @@ -49,7 +49,6 @@ setup:

- name: install pulsar cluster
command: |
helm repo add streamnative https://charts.streamnative.io
rm -rf pulsar-charts/
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
cd pulsar-charts/
Expand Down
3 changes: 1 addition & 2 deletions .ci/tests/integration/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ setup:
image="function-mesh-operator:latest"
IMG=${image} make docker-build-skip-test
kind load docker-image ${image}
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --create-namespace charts/function-mesh-operator
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.pauseRollout=false --create-namespace charts/function-mesh-operator
wait:
- namespace: function-mesh
resource: pod
Expand All @@ -52,7 +52,6 @@ setup:

- name: install pulsar cluster
command: |
helm repo add streamnative https://charts.streamnative.io
rm -rf pulsar-charts/
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
cd pulsar-charts/
Expand Down
3 changes: 1 addition & 2 deletions .ci/tests/integration/e2e_with_tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ setup:
image="function-mesh-operator:latest"
IMG=${image} make docker-build-skip-test
kind load docker-image ${image}
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.pauseRollout=false --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
wait:
- namespace: function-mesh
resource: pod
Expand All @@ -44,7 +44,6 @@ setup:

- name: install pulsar cluster
command: |
helm repo add streamnative https://charts.streamnative.io
rm -rf pulsar-charts/
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
cd pulsar-charts/
Expand Down
60 changes: 30 additions & 30 deletions charts/function-mesh-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,37 @@ function mesh operator Helm chart for Kubernetes

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| admissionWebhook.enabled | bool | `true` | |
| controllerManager.addDefaultAffinity | bool | `true` | |
| controllerManager.affinity | object | `{}` | |
| controllerManager.autoFailover | bool | `true` | |
| controllerManager.configFile | string | `"/etc/config/config.yaml"` | |
| controllerManager.create | bool | `true` | |
| controllerManager.enableInitContainers | bool | `false` | |
| controllerManager.enableLeaderElection | bool | `true` | |
| controllerManager.globalBackendConfig | string | `"global-backend-config"` | |
| controllerManager.globalBackendConfigNamespace | string | `"default"` | |
| controllerManager.healthProbe.port | int | `8000` | |
| controllerManager.metrics.port | int | `8443` | |
| controllerManager.metrics.scheme | string | `"https"` | |
| controllerManager.namespacedBackendConfig | string | `"backend-config"` | |
| controllerManager.nodeSelector | object | `{}` | |
| controllerManager.pauseRollout | bool | `false` | |
| controllerManager.pprof.enable | bool | `false` | |
| controllerManager.pprof.port | int | `8090` | |
| controllerManager.replicas | int | `1` | |
| controllerManager.resources.requests.cpu | string | `"80m"` | |
| controllerManager.resources.requests.memory | string | `"50Mi"` | |
| controllerManager.selector | list | `[]` | |
| controllerManager.serviceAccount | string | `"function-mesh-controller-manager"` | |
| controllerManager.tolerations | list | `[]` | |
| imagePullPolicy | string | `"IfNotPresent"` | |
| imagePullSecrets | list | `[]` | |
| installation.namespace | string | `"function-mesh-system"` | |
| Key | Type | Default | Description |
|-----|------|----------------------------------------|-------------|
| admissionWebhook.enabled | bool | `true` | |
| controllerManager.addDefaultAffinity | bool | `true` | |
| controllerManager.affinity | object | `{}` | |
| controllerManager.autoFailover | bool | `true` | |
| controllerManager.configFile | string | `"/etc/config/config.yaml"` | |
| controllerManager.create | bool | `true` | |
| controllerManager.enableInitContainers | bool | `false` | |
| controllerManager.enableLeaderElection | bool | `true` | |
| controllerManager.globalBackendConfig | string | `"global-backend-config"` | |
| controllerManager.globalBackendConfigNamespace | string | `"default"` | |
| controllerManager.healthProbe.port | int | `8000` | |
| controllerManager.metrics.port | int | `8443` | |
| controllerManager.metrics.scheme | string | `"https"` | |
| controllerManager.namespacedBackendConfig | string | `"backend-config"` | |
| controllerManager.nodeSelector | object | `{}` | |
| controllerManager.pauseRollout | bool | `true` | |
| controllerManager.pprof.enable | bool | `false` | |
| controllerManager.pprof.port | int | `8090` | |
| controllerManager.replicas | int | `1` | |
| controllerManager.resources.requests.cpu | string | `"80m"` | |
| controllerManager.resources.requests.memory | string | `"50Mi"` | |
| controllerManager.selector | list | `[]` | |
| controllerManager.serviceAccount | string | `"function-mesh-controller-manager"` | |
| controllerManager.tolerations | list | `[]` | |
| imagePullPolicy | string | `"IfNotPresent"` | |
| imagePullSecrets | list | `[]` | |
| installation.namespace | string | `"function-mesh-system"` | |
| operatorImage | string | `"streamnative/function-mesh:v0.29.0"` | |
| rbac.create | bool | `true` | |
| rbac.create | bool | `true` | |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
2 changes: 1 addition & 1 deletion charts/function-mesh-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ controllerManager:
globalBackendConfigNamespace: default
namespacedBackendConfig: backend-config
addDefaultAffinity: true
pauseRollout: false
pauseRollout: true

admissionWebhook:
enabled: true
1 change: 1 addition & 0 deletions config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
- "--namespaced-backend-config=backend-config"
- "--global-backend-config=global-backend-config"
- "--global-backend-config-namespace=sn-system"
- "--pause-rollout=true"
ports:
- containerPort: 8443
name: metrics
Expand Down
1 change: 1 addition & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
- --namespaced-backend-config=backend-config
- --global-backend-config=global-backend-config
- --global-backend-config-namespace=sn-system
- --pause-rollout=true
image: controller:latest
name: manager
resources:
Expand Down
38 changes: 19 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.25.0

require (
github.com/apache/pulsar-client-go v0.17.0
github.com/go-logr/logr v1.4.3
github.com/go-logr/logr v1.4.4
github.com/golang/protobuf v1.5.4
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.35.1
Expand All @@ -28,7 +28,7 @@ require (
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand All @@ -55,7 +55,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -84,28 +84,28 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
go.opentelemetry.io/otel v1.45.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.45.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.45.0 // indirect
go.opentelemetry.io/otel/metric v1.45.0 // indirect
go.opentelemetry.io/otel/sdk v1.45.0 // indirect
go.opentelemetry.io/otel/trace v1.45.0 // indirect
go.opentelemetry.io/proto/otlp v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.56.0 // indirect
golang.org/x/net v0.58.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.21.0 // indirect
golang.org/x/sys v0.46.0 // indirect
golang.org/x/term v0.44.0 // indirect
golang.org/x/text v0.39.0 // indirect
golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.47.0 // indirect
golang.org/x/term v0.45.0 // indirect
golang.org/x/text v0.41.0 // indirect
golang.org/x/time v0.10.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/grpc v1.82.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d // indirect
google.golang.org/grpc v1.83.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading
Loading