From e3fd7d32da36b96baced20557d8a3159b2075b40 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Thu, 23 Mar 2023 09:00:38 -0700 Subject: [PATCH 1/3] Use GH issues type for edu board (#16750) --- .github/workflows/jira-issues.yaml | 2 +- .github/workflows/jira-pr.yaml | 2 +- website/content/docs/enterprise/index.mdx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jira-issues.yaml b/.github/workflows/jira-issues.yaml index f71727bf62d1..f3eabf888352 100644 --- a/.github/workflows/jira-issues.yaml +++ b/.github/workflows/jira-issues.yaml @@ -63,7 +63,7 @@ jobs: uses: tomhjp/gh-action-jira-create@v0.2.1 with: project: CE - issuetype: "Bug" + issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}" summary: "${{ github.event.repository.name }} [${{ steps.set-ticket-type.outputs.TYPE }} #${{ github.event.issue.number }}]: ${{ github.event.issue.title }}" description: "GitHub URL: ${{ github.event.issue.html_url || github.event.pull_request.html_url }}\n\n${{ github.event.issue.body || github.event.pull_request.body }}\n\n_Created in GitHub by ${{ github.actor }}._" # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve) diff --git a/.github/workflows/jira-pr.yaml b/.github/workflows/jira-pr.yaml index 4b872b6aaf88..33b66093382f 100644 --- a/.github/workflows/jira-pr.yaml +++ b/.github/workflows/jira-pr.yaml @@ -82,7 +82,7 @@ jobs: uses: tomhjp/gh-action-jira-create@v0.2.1 with: project: CE - issuetype: "Bug" + issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}" summary: "${{ github.event.repository.name }} [${{ steps.set-ticket-type.outputs.TYPE }} #${{ github.event.issue.number }}]: ${{ github.event.issue.title }}" description: "GitHub URL: ${{ github.event.issue.html_url || github.event.pull_request.html_url }}\n\n${{ github.event.issue.body || github.event.pull_request.body }}\n\n_Created in GitHub by ${{ github.actor }}._" # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve) diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx index e63363e81069..b6805604b1e8 100644 --- a/website/content/docs/enterprise/index.mdx +++ b/website/content/docs/enterprise/index.mdx @@ -2,7 +2,7 @@ layout: docs page_title: Consul Enterprise description: >- - Consul Enterprise is a paid offering that extends Consul’s open source functions to support large and complex deployments. Learn about scaling infrastructure, simplifying operations, and making networks more resilient with Enterprise. + Consul Enterprise is a paid offering that extends Consul’s open source functions to support large and complex deployments. Learn about scaling infrastructure, simplifying operations, and making networks more resilient with Enterprise. Evaluate Enteprise features with the feature availability and compatibility matrix. --- # Consul Enterprise From 3df271959cf04bb79cf9d42bfabaf2edc13ca44a Mon Sep 17 00:00:00 2001 From: Poonam Jadhav Date: Thu, 23 Mar 2023 12:14:59 -0400 Subject: [PATCH 2/3] fix: remove unused tenancy category from rate limit spec (#16740) --- agent/consul/rate/handler.go | 1 - 1 file changed, 1 deletion(-) diff --git a/agent/consul/rate/handler.go b/agent/consul/rate/handler.go index d2c33ab88cce..f1860065d1b4 100644 --- a/agent/consul/rate/handler.go +++ b/agent/consul/rate/handler.go @@ -112,7 +112,6 @@ const ( OperationCategoryHealth OperationCategory = "Health" OperationCategoryIntention OperationCategory = "Intention" OperationCategoryKV OperationCategory = "KV" - OperationCategoryTenancy OperationCategory = "Tenancy" OperationCategoryPreparedQuery OperationCategory = "PreparedQuery" OperationCategorySession OperationCategory = "Session" OperationCategoryStatus OperationCategory = "Status" From d61f3dafac24b58e718dd8648c05c215b5a850a7 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Thu, 23 Mar 2023 11:21:27 -0500 Subject: [PATCH 3/3] Remove version bump from CRT workflow (#16728) This bumps the version to reflect the next patch release; however, we use a specific branch for each patch release and so never wind up cutting a release directly from the `release/1.15.x` (for example) where this is intended to work. --- .release/ci.hcl | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.release/ci.hcl b/.release/ci.hcl index 062a925102d3..dfe69d2fc1eb 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -132,21 +132,9 @@ event "post-publish-website" { on = "always" } } -event "bump-version" { - depends = ["post-publish-website"] - action "bump-version" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "bump-version" - } - - notification { - on = "fail" - } -} event "update-ironbank" { - depends = ["bump-version"] + depends = ["post-publish-website"] action "update-ironbank" { organization = "hashicorp" repository = "crt-workflows-common"