Skip to content

Commit 2bb5b67

Browse files
freeznetfreeznet
authored
* fix cve from 0.24.0 * fix build * fix vet error * install fixed version of vpa * fix ci
1 parent aa3e594 commit 2bb5b67

File tree

21 files changed

+506
-562
lines changed

21 files changed

+506
-562
lines changed

‎.ci/tests/integration-oauth2/e2e.yaml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@ setup:
2424
label-selector: app=cert-manager
2525
for: condition=Ready
2626

27+
- name: install function-mesh operator
28+
command: |
29+
make manager
30+
make helm-crds
31+
image="function-mesh:latest"
32+
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
33+
kind load docker-image ${image}
34+
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
35+
wait:
36+
- namespace: function-mesh
37+
resource: pod
38+
label-selector: app.kubernetes.io/name=function-mesh-operator
39+
for: condition=Ready
40+
- name: apply global env config map
41+
command: |
42+
kubectl create -n ${FUNCTION_MESH_NAMESPACE} -f .ci/clusters/global_backend_config_without_env.yaml
43+
2744
- name: Update values file
2845
command: |
2946
sed -i "s/CLIENT_SECRET/${AZURE_CLIENT_SECRET}/g" .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml
@@ -94,22 +111,6 @@ setup:
94111
command: |
95112
sed -i "s/GCP_KEY_DATA/${GSA_CREDENTIAL}/g" .ci/tests/integration-oauth2/cases/google-pubsub-source/manifests.yaml
96113
97-
- name: install function-mesh operator
98-
command: |
99-
make manager
100-
make helm-crds
101-
image="function-mesh:latest"
102-
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
103-
kind load docker-image ${image}
104-
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
105-
wait:
106-
- namespace: function-mesh
107-
resource: pod
108-
label-selector: app.kubernetes.io/name=function-mesh-operator
109-
for: condition=Ready
110-
- name: apply global env config map
111-
command: |
112-
kubectl create -n ${FUNCTION_MESH_NAMESPACE} -f .ci/clusters/global_backend_config_without_env.yaml
113114
timeout: 60m
114115

115116
cleanup:

‎.ci/tests/integration-oauth2/e2e_with_downloader.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ setup:
2424
label-selector: app=cert-manager
2525
for: condition=Ready
2626

27+
- name: install function-mesh operator
28+
command: |
29+
make manager
30+
make helm-crds
31+
image="function-mesh:latest"
32+
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
33+
kind load docker-image ${image}
34+
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
35+
wait:
36+
- namespace: function-mesh
37+
resource: pod
38+
label-selector: app.kubernetes.io/name=function-mesh-operator
39+
for: condition=Ready
40+
41+
- name: apply global env config map
42+
command: |
43+
kubectl create -n ${FUNCTION_MESH_NAMESPACE} -f .ci/clusters/global_backend_config.yaml
44+
2745
- name: Update values file
2846
command: |
2947
sed -i "s/CLIENT_SECRET/${AZURE_CLIENT_SECRET}/g" .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml
@@ -89,23 +107,6 @@ setup:
89107
command: |
90108
kubectl cp .ci/examples/py-examples/exclamation.zip nginx-0:/tmp
91109
92-
- name: install function-mesh operator
93-
command: |
94-
make manager
95-
make helm-crds
96-
image="function-mesh:latest"
97-
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
98-
kind load docker-image ${image}
99-
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
100-
wait:
101-
- namespace: function-mesh
102-
resource: pod
103-
label-selector: app.kubernetes.io/name=function-mesh-operator
104-
for: condition=Ready
105-
106-
- name: apply global env config map
107-
command: |
108-
kubectl create -n ${FUNCTION_MESH_NAMESPACE} -f .ci/clusters/global_backend_config.yaml
109110
timeout: 60m
110111

111112
cleanup:

‎.ci/tests/integration/e2e.yaml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,28 @@ setup:
2828
command: |
2929
helm repo add cowboysysop https://cowboysysop.github.io/charts/
3030
helm repo update
31-
helm install vpa cowboysysop/vertical-pod-autoscaler
31+
helm install vpa cowboysysop/vertical-pod-autoscaler --version 6.0.3
3232
wait:
3333
- namespace: default
3434
resource: pod
3535
label-selector: app.kubernetes.io/name=vertical-pod-autoscaler
3636
for: condition=Ready
3737

38+
- name: install function-mesh operator
39+
command: |
40+
make generate
41+
make helm-crds
42+
image="function-mesh-operator:latest"
43+
IMG=${image} make docker-build-skip-test
44+
kind load docker-image ${image}
45+
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --create-namespace charts/function-mesh-operator
46+
wait:
47+
- namespace: function-mesh
48+
resource: pod
49+
label-selector: app.kubernetes.io/name=function-mesh-operator
50+
for: condition=Ready
51+
52+
3853
- name: install pulsar cluster
3954
command: |
4055
helm repo add streamnative https://charts.streamnative.io
@@ -90,19 +105,6 @@ setup:
90105
bash .ci/upload_function.sh pypip
91106
bash .ci/upload_function.sh go
92107
93-
- name: install function-mesh operator
94-
command: |
95-
make generate
96-
make helm-crds
97-
image="function-mesh-operator:latest"
98-
IMG=${image} make docker-build-skip-test
99-
kind load docker-image ${image}
100-
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --create-namespace charts/function-mesh-operator
101-
wait:
102-
- namespace: function-mesh
103-
resource: pod
104-
label-selector: app.kubernetes.io/name=function-mesh-operator
105-
for: condition=Ready
106108
timeout: 80m
107109

108110
cleanup:

‎.ci/tests/integration/e2e_with_tls.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ setup:
2424
label-selector: app=cert-manager
2525
for: condition=Ready
2626

27+
- name: install function-mesh operator
28+
command: |
29+
make generate
30+
make helm-crds
31+
image="function-mesh-operator:latest"
32+
IMG=${image} make docker-build-skip-test
33+
kind load docker-image ${image}
34+
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
35+
wait:
36+
- namespace: function-mesh
37+
resource: pod
38+
label-selector: app.kubernetes.io/name=function-mesh-operator
39+
for: condition=Ready
40+
41+
- name: apply global env config map
42+
command: |
43+
kubectl create -n ${FUNCTION_MESH_NAMESPACE} -f .ci/clusters/global_backend_config.yaml
44+
2745
- name: install pulsar cluster
2846
command: |
2947
helm repo add streamnative https://charts.streamnative.io
@@ -81,24 +99,6 @@ setup:
8199
sed -i "s/http:\/\/sn-platform-pulsar-broker.default.svc.cluster.local:8080/https:\/\/sn-platform-pulsar-broker.default.svc.cluster.local:8443/" .ci/tests/integration/cases/*/*.yaml
82100
sed -i "s/pulsar:\/\/sn-platform-pulsar-broker.default.svc.cluster.local:6650/pulsar+ssl:\/\/sn-platform-pulsar-broker.default.svc.cluster.local:6651/" .ci/tests/integration/cases/*/*.yaml
83101
84-
- name: install function-mesh operator
85-
command: |
86-
make generate
87-
make helm-crds
88-
image="function-mesh-operator:latest"
89-
IMG=${image} make docker-build-skip-test
90-
kind load docker-image ${image}
91-
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
92-
wait:
93-
- namespace: function-mesh
94-
resource: pod
95-
label-selector: app.kubernetes.io/name=function-mesh-operator
96-
for: condition=Ready
97-
98-
- name: apply global env config map
99-
command: |
100-
kubectl create -n ${FUNCTION_MESH_NAMESPACE} -f .ci/clusters/global_backend_config.yaml
101-
102102
timeout: 60m
103103

104104
cleanup:

‎.github/workflows/bundle-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ jobs:
4949
username: ${{ secrets.DOCKER_USER }}
5050
password: ${{ secrets.DOCKER_PASSWORD }}
5151

52-
- name: Set up GO 1.23.7
52+
- name: Set up GO 1.24.2
5353
uses: actions/setup-go@v1
5454
with:
55-
go-version: 1.23.7
55+
go-version: 1.24.2
5656
id: go
5757

5858
- name: InstallKubebuilder
@@ -180,10 +180,10 @@ jobs:
180180
username: ${{ secrets.DOCKER_USER }}
181181
password: ${{ secrets.DOCKER_PASSWORD }}
182182

183-
- name: Set up GO 1.23.7
183+
- name: Set up GO 1.24.2
184184
uses: actions/setup-go@v1
185185
with:
186-
go-version: 1.23.7
186+
go-version: 1.24.2
187187
id: go
188188

189189
- name: InstallKubebuilder

‎.github/workflows/olm-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
- name: checkout
3535
uses: actions/checkout@v2
3636

37-
- name: Set up GO 1.23.7
37+
- name: Set up GO 1.24.2
3838
uses: actions/setup-go@v1
3939
with:
40-
go-version: 1.23.7
40+
go-version: 1.24.2
4141
id: go
4242

4343
- name: InstallKubebuilder

‎.github/workflows/project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
go-version: [1.22.12, 1.23.7]
21+
go-version: [1.22.12, 1.24.2]
2222
steps:
2323
- name: Free Disk Space (Ubuntu)
2424
uses: jlumbroso/[email protected]

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
username: ${{ secrets.DOCKER_USER }}
3838
password: ${{ secrets.DOCKER_PASSWORD }}
3939

40-
- name: Set up GO 1.23.7
40+
- name: Set up GO 1.24.2
4141
uses: actions/setup-go@v1
4242
with:
43-
go-version: 1.23.7
43+
go-version: 1.24.2
4444
id: go
4545

4646
- name: InstallKubebuilder

‎.github/workflows/test-helm-charts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ jobs:
8383
run: hack/kind-cluster-build.sh --name chart-testing -c 1 -v 10 --k8sVersion v1.23.17
8484
if: steps.list-changed.outputs.changed == 'true'
8585

86-
- name: Set up GO 1.23.7
86+
- name: Set up GO 1.24.2
8787
if: steps.list-changed.outputs.changed == 'true'
8888
uses: actions/setup-go@v1
8989
with:
90-
go-version: 1.23.7
90+
go-version: 1.24.2
9191
id: go
9292

9393
- name: setup kubebuilder 3.6.0

‎.github/workflows/trivy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
repository: ${{github.event.pull_request.head.repo.full_name}}
3535
ref: ${{ github.event.pull_request.head.sha }}
3636

37-
- name: Set up GO 1.23.7
37+
- name: Set up GO 1.24.2
3838
uses: actions/setup-go@v1
3939
with:
40-
go-version: 1.23.7
40+
go-version: 1.24.2
4141
id: go
4242

4343
- name: InstallKubebuilder

0 commit comments

Comments
 (0)