Skip to content

Commit 1df102e

Browse files
freeznetfreeznet
committed
fix vet error
1 parent 8b93807 commit 1df102e

File tree

4 files changed

+69
-64
lines changed

4 files changed

+69
-64
lines changed

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

+17-16
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

+18-17
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

+14-13
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ 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} --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+
2741
- name: setup vpa
2842
command: |
2943
helm repo add cowboysysop https://cowboysysop.github.io/charts/
@@ -90,19 +104,6 @@ setup:
90104
bash .ci/upload_function.sh pypip
91105
bash .ci/upload_function.sh go
92106
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
106107
timeout: 80m
107108

108109
cleanup:

‎.ci/tests/integration/e2e_with_tls.yaml

+20-18
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,26 @@ 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+
45+
46+
2747
- name: install pulsar cluster
2848
command: |
2949
helm repo add streamnative https://charts.streamnative.io
@@ -81,24 +101,6 @@ setup:
81101
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
82102
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
83103
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-
102104
timeout: 60m
103105

104106
cleanup:

0 commit comments

Comments
 (0)