Skip to content

Commit

Permalink
Merge branch 'main' into kachawla/terraform-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
kachawla authored Nov 3, 2023
2 parents 2dde25c + c6a9049 commit f7666c2
Show file tree
Hide file tree
Showing 17 changed files with 493 additions and 1,009 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/engineering.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Engineering Improvement
about: Report problems or suggestions to improve the Radius engineering processes and/or pipelines
title: "<TITLE>"
assignees: ''
labels: ["engineering"]
labels: ["maintenance"]
---

## Engineering Improvement
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Feature Request
about: Request a feature in Radius
title: "<FEATURE TITLE>"
assignees: ''
labels: ["feature"]
---

## Overview of feature request
Expand Down
109 changes: 109 additions & 0 deletions .github/triage-bot/triage-bot-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# ------------------------------------------------------------
# Copyright 2023 The Radius Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ------------------------------------------------------------

# This is the configuration file for the Radius Triage Bot.
#
# See: https://github.com/dessant/label-actions for documentation.


# Creation labels

bug:
comment: |
:wave: @{issue-author} Thanks for filing this bug report.
A project maintainer will review this report and get back to you soon. If you'd like immediate help troubleshooting, please visit our [Discord server](https://aka.ms/radius/discord).
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
feature:
comment: |
:wave: @{issue-author} Thanks for filing this feature request.
A project maintainer will review this feature request and get back to you soon.
We also welcome community contributions! If you would like to pick this item up sooner and submit a pull request, please visit our [contribution guidelines](https://github.com/radius-project/radius/blob/main/CONTRIBUTING.md) and assign this to yourself by commenting "/assign" on this issue.
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
maintenance:
comment: |
:wave: @{issue-author} Thanks for filing this issue.
A project maintainer will review this issue and get back to you soon.
We also welcome community contributions! If you would like to pick this item up sooner and submit a pull request, please visit our [contribution guidelines](https://github.com/radius-project/radius/blob/main/CONTRIBUTING.md) and assign this to yourself by commenting "/assign" on this issue.
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
# Processing labels

needs-more-information:
comment: |
:wave: @{issue-author} we need more information.
To help us investigate further, we need additional information to reproduce or understand this issue. Please ensure you have steps to reproduce and information about your OS, rad CLI version, and runtime version.
A project maintainer will reply on this issue soon to ask for additional specifics if needed.
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
triaged:
comment: |
:+1: We've reviewed this issue and have agreed to add it to our backlog. Please subscribe to this issue for notifications, we'll provide updates when we pick it up.
We also welcome community contributions! If you would like to pick this item up sooner and submit a pull request, please visit our [contribution guidelines](https://github.com/radius-project/radius/blob/main/CONTRIBUTING.md) and assign this to yourself by commenting "/assign" on this issue.
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
important:
comment: |
We've prioritized work on this issue. Please subscribe to this issue for notifications, we'll provide updates as we make progress.
We also welcome community contributions! If you would like to pick this item up sooner and submit a pull request, please visit our [contribution guidelines](https://github.com/radius-project/radius/blob/main/CONTRIBUTING.md) and assign this to yourself by commenting "/assign" on this issue.
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
'good first issue':
comment: |
This issue is a great one to pickup for new contributors. It should only require small changes and not assume a deep knowledge of the Radius architecture.
We always welcome community contributions! If you would like to pick this item up sooner and submit a pull request, please visit our [contribution guidelines](https://github.com/radius-project/radius/blob/main/CONTRIBUTING.md) and assign this to yourself by commenting "/assign" on this issue.
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
# Closing labels

wont-fix:
close: true
close-reason: 'not planned'
comment: |
:wave: @{issue-author} We've reviewed this issue and have decided not to address it at this time and to close it. If you have any questions or would like to discuss more, please reply to this issue and/or reach out on our [Discord server](https://aka.ms/radius/discord).
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
duplicate:
close: true
close-reason: 'not planned'
comment: |
Thanks for filing this issue. We're closing this as a duplicate of another issue.
A project maintainer will review this and link the duplicate item and get back to you soon. If you have any questions or would like to discuss more, please reply to this issue and/or reach out on our [Discord server](https://aka.ms/radius/discord).
_For more information on our triage process please visit our [triage overview](https://github.com/radius-project/radius/blob/main/docs/contributing/triage/triage-process.md)_
40 changes: 40 additions & 0 deletions .github/workflows/triage-bot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# ------------------------------------------------------------
# Copyright 2023 The Radius Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ------------------------------------------------------------

name: 'Radius Triage Bot'
on:
issues:
types: [labeled, unlabeled]
permissions:
contents: read
issues: write
jobs:
build:
name: 'Process Triage Labels'
runs-on: ubuntu-latest
env:
RADIUS_TRIAGE_BOT_APP_ID: 417813
steps:
- uses: tibdex/github-app-token@v1
id: get_installation_token
with:
app_id: ${{ env.RADIUS_TRIAGE_BOT_APP_ID }}
private_key: ${{ secrets.RADIUS_TRIAGE_BOT_PRIVATE_KEY }}
- uses: dessant/label-actions@v3
with:
github-token: ${{ steps.get_installation_token.outputs.token }}
config-path: '.github/triage-bot/triage-bot-config.yaml'
process-only: 'issues'
10 changes: 2 additions & 8 deletions cmd/applications-rp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ import (
"github.com/radius-project/radius/pkg/server"
"github.com/radius-project/radius/pkg/trace"

pr_backend "github.com/radius-project/radius/pkg/portableresources/backend"
pr_frontend "github.com/radius-project/radius/pkg/portableresources/frontend"
"github.com/radius-project/radius/pkg/ucp/data"
"github.com/radius-project/radius/pkg/ucp/dataprovider"
"github.com/radius-project/radius/pkg/ucp/hosting"
"github.com/radius-project/radius/pkg/ucp/ucplog"

corerp_setup "github.com/radius-project/radius/pkg/corerp/setup"
daprrp_setup "github.com/radius-project/radius/pkg/daprrp/setup"
dsrp_setup "github.com/radius-project/radius/pkg/datastoresrp/setup"
msgrp_setup "github.com/radius-project/radius/pkg/messagingrp/setup"
)
Expand Down Expand Up @@ -122,12 +121,6 @@ func main() {
hostingSvc,
server.NewAPIService(options, builders),
server.NewAsyncWorker(options, builders),

// Configure Portable Resources to run it with Applications.Core RP.
//
// This is temporary until we migrate these resources to use the new registration model.
pr_frontend.NewService(prOptions),
pr_backend.NewService(prOptions),
)

tracerOpts := options.Config.TracerProvider
Expand Down Expand Up @@ -159,6 +152,7 @@ func builders(options hostoptions.HostOptions) ([]builder.Builder, error) {

return []builder.Builder{
corerp_setup.SetupNamespace(config).GenerateBuilder(),
daprrp_setup.SetupNamespace(config).GenerateBuilder(),
msgrp_setup.SetupNamespace(config).GenerateBuilder(),
dsrp_setup.SetupNamespace(config).GenerateBuilder(),
// Add resource provider builders...
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucpd/ucp-self-hosted-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ planes:
resourceProviders:
Applications.Core: "http://localhost:8080"
Applications.Messaging: "http://localhost:8080"
Applications.Dapr: "http://localhost:8081"
Applications.Dapr: "http://localhost:8080"
Applications.Datastores: "http://localhost:8080"
Microsoft.Resources: "http://localhost:5017"
kind: "UCPNative"
Expand Down
2 changes: 1 addition & 1 deletion deploy/Chart/templates/ucp/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data:
properties:
resourceProviders:
Applications.Core: "http://applications-rp.radius-system:5443"
Applications.Dapr: "http://applications-rp.radius-system:5444"
Applications.Dapr: "http://applications-rp.radius-system:5443"
Applications.Datastores: "http://applications-rp.radius-system:5443"
Applications.Messaging: "http://applications-rp.radius-system:5443"
Microsoft.Resources: "http://bicep-de.radius-system:6443"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ planes:
properties:
resourceProviders:
Applications.Core: "http://applications-rp.radius-system:5443"
Applications.Dapr: "http://applications-rp.radius-system:5444"
Applications.Dapr: "http://applications-rp.radius-system:5443"
Applications.Datastores: "http://applications-rp.radius-system:5443"
Applications.Messaging: "http://applications-rp.radius-system:5443"
Microsoft.Resources: "http://bicep-de.radius-system:6443"
Expand Down
4 changes: 2 additions & 2 deletions pkg/daprrp/frontend/controller/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ const (
// AsyncCreateOrUpdateDaprSecretStoreTimeout is the timeout for async create or update dapr secret store
AsyncCreateOrUpdateDaprSecretStoreTimeout = time.Duration(60) * time.Minute
// AsyncDeleteDaprSecretStoreTimeout is the timeout for async delete dapr secret store
AsyncDeleteDaprSecretStoreTimeout = time.Duration(30) * time.Minute
AsyncDeleteDaprSecretStoreTimeout = time.Duration(60) * time.Minute

// DaprPubSubBrokersResourceType represents the resource type for Dapr PubSub brokers.
DaprPubSubBrokersResourceType = "Applications.Dapr/pubSubBrokers"
// AsyncCreateOrUpdateDaprPubSubBrokerTimeout is the timeout for async create or update dapr pub sub broker
AsyncCreateOrUpdateDaprPubSubBrokerTimeout = time.Duration(60) * time.Minute
// AsyncDeleteDaprPubSubBrokerTimeout is the timeout for async delete dapr pub sub broker
AsyncDeleteDaprPubSubBrokerTimeout = time.Duration(30) * time.Minute
AsyncDeleteDaprPubSubBrokerTimeout = time.Duration(60) * time.Minute
)
142 changes: 142 additions & 0 deletions pkg/daprrp/setup/operations.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
/*
Copyright 2023 The Radius Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package setup

import v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"

var operationList = []v1.Operation{
{
Name: "Applications.Dapr/operations/read",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "operations",
Operation: "Get operations",
Description: "Get the list of operations.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/register/action",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "Applications.Dapr",
Operation: "Register Applications.Dapr resource provider",
Description: "Registers 'Applications.Dapr' resource provider with a subscription.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/unregister/action",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "Applications.Dapr",
Operation: "Unregister 'Applications.Dapr' resource provider",
Description: "Unregisters 'Applications.Dapr' resource provider with a subscription.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/secretStores/read",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "secretStores",
Operation: "Get/List Dapr secretStores",
Description: "Gets/Lists Dapr secretStore resource(s).",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/secretStores/write",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "secretStores",
Operation: "Create/Update Dapr secretStores",
Description: "Creates or updates a Dapr secretStore resource.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/secretStores/delete",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "secretStores",
Operation: "Delete Dapr secretStore",
Description: "Deletes a Dapr secretStore resource.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/stateStores/read",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "stateStores",
Operation: "Get/List Dapr stateStores",
Description: "Gets/Lists Dapr stateStore resource(s).",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/stateStores/write",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "stateStores",
Operation: "Create/Update Dapr stateStores",
Description: "Creates or updates a Dapr stateStore resource.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/stateStores/delete",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "stateStores",
Operation: "Delete Dapr stateStore",
Description: "Deletes a Dapr stateStore resource.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/pubSubBrokers/read",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "pubSubBrokers",
Operation: "Get/List Dapr pubSubBrokers",
Description: "Gets/Lists Dapr pubSubBroker resource(s).",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/pubSubBrokers/write",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "pubSubBrokers",
Operation: "Create/Update Dapr pubSubBrokers",
Description: "Creates or updates a Dapr pubSubBroker resource.",
},
IsDataAction: false,
},
{
Name: "Applications.Dapr/pubSubBrokers/delete",
Display: &v1.OperationDisplayProperties{
Provider: "Applications.Dapr",
Resource: "pubSubBrokers",
Operation: "Delete Dapr pubSubBroker",
Description: "Deletes a Dapr pubSubBroker resource.",
},
IsDataAction: false,
},
}
Loading

0 comments on commit f7666c2

Please sign in to comment.