Skip to content

Commit

Permalink
Merge branch 'main' into tf-submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
sk593 authored Jan 17, 2024
2 parents 8e5a6e5 + 90a9b1e commit 370a14b
Show file tree
Hide file tree
Showing 15 changed files with 390 additions and 178 deletions.
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug.md

This file was deleted.

71 changes: 71 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Bug Report
description: Report broken functionality within Radius
title: "<BUG TITLE>"
labels: ["bug"]
body:
- type: markdown
attributes:
value: "## Bug information"
- type: textarea
attributes:
label: Steps to reproduce
description: How can we recreate this bug? Be specific.
validations:
required: true
- type: textarea
attributes:
label: Observed behavior
description: What you're experiencing that you believe is a bug.
placeholder: |
If applicable, add screenshots to help explain your problem.
Tip: You can attach images or files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: textarea
attributes:
label: Desired behavior
description: What you're expecting to happen.
validations:
required: true
- type: textarea
attributes:
label: Workaround
description: Have you found a workaround to get you unblocked?
validations:
required: false
- type: markdown
attributes:
value: "## System information"
- type: textarea
attributes:
label: rad Version
description: What rad cli version are you running?
placeholder: PASTE OUTPUT OF "rad version"
validations:
required: true
- type: textarea
attributes:
label: Operating system
description: What operating system (macOS Monterey, Windows 11, etc.) and architecture (x86, x64, arm64, etc.) are you running?
placeholder: |
For example: macOS Monterey, M1 chip
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: Add any other context about the problem here.
placeholder: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: checkboxes
attributes:
label: Would you like to support us?
description: Would you like to support us in fixing this bug?
options:
- label: Yes, I would like to support you
required: false
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/engineering.md

This file was deleted.

71 changes: 71 additions & 0 deletions .github/ISSUE_TEMPLATE/engineering.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Engineering Improvement
description: Report problems or suggestions to improve the Radius engineering processes and/or pipelines
title: "<TITLE>"
labels: ["maintenance"]
body:
- type: markdown
attributes:
value: "## Engineering Improvement"
- type: textarea
attributes:
label: Area for Improvement
description: What engineering process or tools can be improved? Build? Testing? ...? Be specific.
validations:
required: true
- type: textarea
attributes:
label: Observed behavior
description: What you're experiencing that you believe could be improved.
placeholder: |
If applicable, add screenshots to help explain your problem.
Tip: You can attach images or files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: textarea
attributes:
label: Desired behavior
description: What you'd like to happen.
validations:
required: true
- type: textarea
attributes:
label: Proposed Fix
description: Have you found a way to implement or fix the issue?
validations:
required: false
- type: markdown
attributes:
value: "## System information"
- type: textarea
attributes:
label: rad Version
description: What rad cli version are you running?
placeholder: PASTE OUTPUT OF "rad version"
validations:
required: true
- type: textarea
attributes:
label: Operating system
description: What operating system (macOS Monterey, Windows 11, etc.) and architecture (x86, x64, arm64, etc.) are you running?
placeholder: |
For example: macOS Monterey, M1 chip
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: Add any other context about the problem here
placeholder: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: checkboxes
attributes:
label: Would you like to support us?
description: Would you like to support us in improving Radius engineering processes and/or pipelines?
options:
- label: Yes, I would like to support you
required: false
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/feature.md

This file was deleted.

34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Feature Request
description: Request a feature in Radius
title: "<FEATURE TITLE>"
labels: ["feature"]
body:
- type: textarea
attributes:
label: Overview of feature request
description: What are you proposing Radius add/update/remove?
validations:
required: true
- type: textarea
attributes:
label: Acceptance criteria
description: What will need to be completed/working for this feature to be marked "Done"?
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: Add any other context about the problem here
placeholder: |
Links? References? Anything that will give us more context about the feature you are looking for!
Tip: You can attach images or files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: checkboxes
attributes:
label: Would you like to support us?
description: Would you like to support us in implementing the feature?
options:
- label: Yes, I would like to support you
required: false
35 changes: 0 additions & 35 deletions .github/workflows/issues.yaml

This file was deleted.

24 changes: 20 additions & 4 deletions .github/workflows/long-running-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ env:
# Radius test environment name
RADIUS_TEST_ENVIRONMENT_NAME: 'kind-radius'

# The current GitHub action link
ACTION_LINK: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'

jobs:
build:
name: Build Radius for test
Expand Down Expand Up @@ -388,10 +391,6 @@ jobs:
rad env create ${{ env.RADIUS_TEST_ENVIRONMENT_NAME }} --namespace default
rad env switch ${{ env.RADIUS_TEST_ENVIRONMENT_NAME }}
# Temporary workaround to fix the x509 certificate error in the controller.
# https://github.com/radius-project/radius/issues/6989
kubectl delete secrets controller-cert -n radius-system --ignore-not-found
echo "*** Configuring Azure provider ***"
rad env update ${{ env.RADIUS_TEST_ENVIRONMENT_NAME }} --azure-subscription-id ${{ secrets.INTEGRATION_TEST_SUBSCRIPTION_ID }} \
--azure-resource-group ${{ env.AZURE_TEST_RESOURCE_GROUP }}
Expand Down Expand Up @@ -480,3 +479,20 @@ jobs:
- name: Clean up cluster
if: always()
run: ./.github/scripts/cleanup-cluster.sh
report-failure:
name: Report test failure
needs: [build, tests]
runs-on: ubuntu-latest
if: failure() && github.repository == 'radius-project/radius'
steps:
- name: Create failure issue for failing long running test run
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GH_RAD_CI_BOT_PAT }}
script: |
github.rest.issues.create({
...context.repo,
title: `Scheduled long running test failed - Run ID: ${context.runId}`,
labels: ['bug', 'test-failure'],
body: `## Bug information \n\nThis bug is generated automatically if the scheduled long running test fails. The Radius long running test operates on a schedule of every 2 hours everyday. It's important to understand that the test may fail due to workflow infrastructure issues, like network problems, rather than the flakiness of the test itself. For the further investigation, please visit [here](${process.env.ACTION_LINK}).`
})
29 changes: 29 additions & 0 deletions deploy/Chart/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,32 @@
{{- end -}}
{{- print $version }}
{{- end -}}

{{/*
Reuses the value from an existing secret, otherwise sets its value to a default value.
Usage:
{{ include "secrets.lookup" (dict "secret" "secret-name" "namespace" "ns-name" "key" "key-name" "defaultValue" "default-secret") }}

Params:
- secret - String - Required - Name of the 'Secret' resource where the password is stored.
- namespace - String - Required - Namespace of the 'Secret' resource where the password is stored.
- key - String - Required - Name of the key in the secret.
- defaultValue - String - Required - Default value to use if the secret does not exist.

References:
- https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_secrets.tpl
*/}}
{{- define "secrets.lookup" -}}
{{- $value := "" -}}
{{- $namespace := .namespace | toString -}}
{{- $secretData := (lookup "v1" "Secret" $namespace .secret).data -}}
{{- if and $secretData (hasKey $secretData .key) -}}
{{- $value = index $secretData .key -}}
{{- else if .defaultValue -}}
{{- $value = .defaultValue | toString | b64enc -}}
{{- end -}}
{{- if $value -}}
{{- printf "%s" $value -}}
{{- end -}}
{{- end -}}
Loading

0 comments on commit 370a14b

Please sign in to comment.