Skip to content

Commit 7335491

Browse files
Fix test
1 parent 75e0952 commit 7335491

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.ci/tests/integration/e2e_with_tls.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ verify:
131131
expected: expected.data.yaml
132132
- query: timeout 5m bash .ci/tests/integration/cases/global-and-namespaced-config/verify.sh
133133
expected: expected.data.yaml
134-
- query: timeout 5m bash .ci/tests/integration/cases/functionmesh-generic-resources/verify.sh
134+
- query: timeout 5m bash .ci/tests/integration/cases/functionmesh-with-generic-resources/verify.sh
135135
expected: expected.data.yaml

api/compute/v1alpha1/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ type ResourceCondition struct {
372372
Condition ResourceConditionType `json:"condition,omitempty"`
373373
Status metav1.ConditionStatus `json:"status,omitempty"`
374374
Action ReconcileAction `json:"action,omitempty"`
375-
ApiVersion string `json:"apiVersion,omitempty"`
375+
APIVersion string `json:"apiVersion,omitempty"`
376376
Kind string `json:"kind,omitempty"`
377377
}
378378

controllers/function_mesh.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func (r *FunctionMeshReconciler) observeGenericResources(ctx context.Context, me
254254
Condition: v1alpha1.GenericResourceReady,
255255
Status: metav1.ConditionFalse,
256256
Action: v1alpha1.Create,
257-
ApiVersion: resource.APIVersion,
257+
APIVersion: resource.APIVersion,
258258
Kind: resource.Kind,
259259
}
260260
continue
@@ -508,7 +508,7 @@ func (r *FunctionMeshReconciler) UpdateFunctionMesh(ctx context.Context, req ctr
508508
if resourceCondition.Condition == v1alpha1.Orphaned {
509509
// clean up the orphaned generic resource
510510
obj := &unstructured.Unstructured{}
511-
obj.SetAPIVersion(resourceCondition.ApiVersion)
511+
obj.SetAPIVersion(resourceCondition.APIVersion)
512512
obj.SetKind(resourceCondition.Kind)
513513
if err := r.Get(ctx, types.NamespacedName{
514514
Namespace: mesh.Namespace,

0 commit comments

Comments
 (0)