Skip to content

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangpengcheng committed May 11, 2024
1 parent 70ee6ee commit 34b2c6f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .ci/tests/integration/e2e_with_tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,5 @@ verify:
expected: expected.data.yaml
- query: timeout 5m bash .ci/tests/integration/cases/global-and-namespaced-config/verify.sh
expected: expected.data.yaml
- query: timeout 5m bash .ci/tests/integration/cases/functionmesh-generic-resources/verify.sh
- query: timeout 5m bash .ci/tests/integration/cases/functionmesh-with-generic-resources/verify.sh
expected: expected.data.yaml
2 changes: 1 addition & 1 deletion api/compute/v1alpha1/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ type ResourceCondition struct {
Condition ResourceConditionType `json:"condition,omitempty"`
Status metav1.ConditionStatus `json:"status,omitempty"`
Action ReconcileAction `json:"action,omitempty"`
ApiVersion string `json:"apiVersion,omitempty"`
APIVersion string `json:"apiVersion,omitempty"`
Kind string `json:"kind,omitempty"`
}

Expand Down
4 changes: 2 additions & 2 deletions controllers/function_mesh.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func (r *FunctionMeshReconciler) observeGenericResources(ctx context.Context, me
Condition: v1alpha1.GenericResourceReady,
Status: metav1.ConditionFalse,
Action: v1alpha1.Create,
ApiVersion: resource.APIVersion,
APIVersion: resource.APIVersion,
Kind: resource.Kind,
}
continue
Expand Down Expand Up @@ -508,7 +508,7 @@ func (r *FunctionMeshReconciler) UpdateFunctionMesh(ctx context.Context, req ctr
if resourceCondition.Condition == v1alpha1.Orphaned {
// clean up the orphaned generic resource
obj := &unstructured.Unstructured{}
obj.SetAPIVersion(resourceCondition.ApiVersion)
obj.SetAPIVersion(resourceCondition.APIVersion)
obj.SetKind(resourceCondition.Kind)
if err := r.Get(ctx, types.NamespacedName{
Namespace: mesh.Namespace,
Expand Down

0 comments on commit 34b2c6f

Please sign in to comment.