Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow up pr for linkrp backend controller. #5049

Merged
merged 5 commits into from
Jan 30, 2023
Merged

Follow up pr for linkrp backend controller. #5049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4f537b
follow up to address comments for link async backedn controller
vishwahiremat Jan 28, 2023
3485c0d
increase test timeout
vishwahiremat Jan 30, 2023
94da347
Trigger Build
vishwahiremat Jan 30, 2023
8751565
enable daprstate store generic functional test
vishwahiremat Jan 30, 2023
71e8687
increase the timeout to 60mins
vishwahiremat Jan 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
runs-on: self-hosted
env:
# Timeout used for Kubernetes functional tests
K8S_FUNCTIONALTEST_TIMEOUT: 30m
K8S_FUNCTIONALTEST_TIMEOUT: 60m
RADIUS_CONTAINER_LOG_BASE: dist/container_logs
RADIUS_CHART_LOCATION: deploy/Chart/
steps:
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ variables:
- name: DOCKER_REGISTRY
value: radiusdev.azurecr.io
- name: K8S_FUNCTIONALTEST_TIMEOUT
value: 30m
value: 60m
- name: AZURE_FUNCTIONALTEST_TIMEOUT
value: 30m
value: 60m
- name: REL_CHANNEL
value: edge
- name: REL_VERSION
Expand Down
10 changes: 5 additions & 5 deletions pkg/linkrp/backend/controller/createorupdateresource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ func (c *CreateOrUpdateResource) Run(ctx context.Context, req *ctrl.Request) (ct
return ctrl.Result{}, err
}

deploymentDataModel, ok := dataModel.(rpv1.DeploymentDataModel)
if !ok {
return ctrl.NewFailedResult(v1.ErrorDetails{Message: "deployment data model conversion error"}), err
}

rendererOutput, err := c.LinkDeploymentProcessor().Render(ctx, id, dataModel)
if err != nil {
return ctrl.Result{}, err
Expand All @@ -70,11 +75,6 @@ func (c *CreateOrUpdateResource) Run(ctx context.Context, req *ctrl.Request) (ct
return ctrl.Result{}, err
}

deploymentDataModel, ok := dataModel.(rpv1.DeploymentDataModel)
if !ok {
return ctrl.NewFailedResult(v1.ErrorDetails{Message: "deployment data model conversion error"}), err
}

oldOutputResources := deploymentDataModel.OutputResources()
err = deploymentDataModel.ApplyDeploymentOutput(deploymentOutput)
if err != nil {
Expand Down
2 changes: 0 additions & 2 deletions test/functional/corerp/resources/dapr_statestore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import (
)

func Test_DaprStateStoreGeneric(t *testing.T) {
t.Skip("This is flaky. Tracked by: https://github.com/project-radius/radius/issues/5047")

template := "testdata/corerp-resources-dapr-statestore-generic.bicep"
name := "corerp-resources-dapr-statestore-generic"
appNamespace := "default-corerp-resources-dapr-statestore-generic"
Expand Down
2 changes: 1 addition & 1 deletion test/functional/corerp/resources/testdata/recipes/test-recipes/dapr_state_store_recipe.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@description('Specifies the location for resources.')
param location string = resourceGroup().location
resource account 'Microsoft.Storage/storageAccounts@2021-09-01' = {
name: 'dapr${uniqueString(resourceGroup().id, deployment().name)}'
name: 'daprrecipe${uniqueString(resourceGroup().id, deployment().name)}'
location: location
sku: {
name: 'Standard_LRS'
Expand Down