From 238d078542519b5c6a52476b0c0330df746e02bb Mon Sep 17 00:00:00 2001 From: Tavis Aitken Date: Wed, 30 Aug 2023 13:05:24 -0600 Subject: [PATCH 1/3] Revert "add cla agreement (#298)" This reverts commit ca2ebde9f7a8304bd7b87de34a249d34846fc66f. --- .github/workflows/agreements.yaml | 46 ------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .github/workflows/agreements.yaml diff --git a/.github/workflows/agreements.yaml b/.github/workflows/agreements.yaml deleted file mode 100644 index 60d811f3..00000000 --- a/.github/workflows/agreements.yaml +++ /dev/null @@ -1,46 +0,0 @@ -name: "Agreements" - -on: - issue_comment: - types: [ created ] - pull_request_target: - types: [ opened, closed, synchronize ] - -jobs: - ContributorLicenseAgreement: - runs-on: ubuntu-latest - steps: - - name: "CLA Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: cla-assistant/github-action@v2.1.3-beta - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }} - with: - path-to-signatures: "signatures/version1/cla.json" - path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CLA.md" # e.g. a CLA or a DCO document - branch: "main" - allowlist: dependabot[bot] - remote-organization-name: splunk - remote-repository-name: cla-agreement - CodeOfConduct: - runs-on: ubuntu-latest - steps: - - name: "COC Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the Code of Conduct and I hereby accept the Terms') || github.event_name == 'pull_request_target' - uses: cla-assistant/github-action@v2.1.3-beta - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }} - with: - path-to-signatures: "signatures/version1/coc.json" - path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CODE_OF_CONDUCT.md" # e.g. a COC or a DCO document - branch: "main" - allowlist: dependabot[bot] - remote-organization-name: splunk - remote-repository-name: cla-agreement - custom-pr-sign-comment: "I have read the Code of Conduct and I hereby accept the Terms" - create-file-commit-message: "For example: Creating file for storing COC Signatures" - signed-commit-message: "$contributorName has signed the COC in #$pullRequestNo" - custom-notsigned-prcomment: "All contributors have NOT signed the COC Document" - custom-allsigned-prcomment: "****CLA Assistant Lite bot**** All contributors have signed the COC ✍️ ✅" From ed8c59dc9c71517643e3b26fce03242dc5e1eb88 Mon Sep 17 00:00:00 2001 From: Tavis Aitken Date: Mon, 23 Oct 2023 16:42:58 -0600 Subject: [PATCH 2/3] Added the CLA agreement. --- .github/workflows/cla.yaml | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/cla.yaml diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml new file mode 100644 index 00000000..a2f8d9ca --- /dev/null +++ b/.github/workflows/cla.yaml @@ -0,0 +1,53 @@ +name: "CLA Assistant" +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened, closed, synchronize] +# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings +permissions: + actions: write + contents: write + pull-requests: write + statuses: write +jobs: + CLAAssistant: + runs-on: ubuntu-latest + steps: + - name: "CLA Assistant" + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + uses: contributor-assistant/github-action@v2.3.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # the below token should have repo scope and must be manually added by you in the repository's secret + # This token is required only if you have configured to store the signatures in a remote repository/organization + PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + with: + path-to-signatures: 'signatures/version1/cla.json' + path-to-document: 'https://github.com/splunk/cla-agreement/blob/main/CLA.md' # e.g. a CLA or a DCO document + # branch should not be protected + branch: 'main' + allowlist: dependabot[bot] + remote-organization-name: splunk + remote-repository-name: cla-agreement + CodeOfConduct: + runs-on: ubuntu-latest + steps: + - name: "COC Assistant" + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the Code of Conduct and I hereby accept the Terms') || github.event_name == 'pull_request_target' + uses: cla-assistant/github-action@v2.3.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + with: + path-to-signatures: "signatures/version1/coc.json" + path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CODE_OF_CONDUCT.md" # e.g. a COC or a DCO document + branch: "main" + allowlist: dependabot[bot] + remote-organization-name: splunk + remote-repository-name: cla-agreement + custom-pr-sign-comment: "I have read the Code of Conduct and I hereby accept the Terms" + create-file-commit-message: "For example: Creating file for storing COC Signatures" + signed-commit-message: "$contributorName has signed the COC in #$pullRequestNo" + custom-notsigned-prcomment: "All contributors have NOT signed the COC Document" + custom-allsigned-prcomment: "****CLA Assistant Lite bot**** All contributors have signed the COC ✍️ ✅" From bd4b2dc18ff9e4a8ca8ced16b28ae9eba04e030c Mon Sep 17 00:00:00 2001 From: Tavis Aitken <45640266+taitken-splunk@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:03:21 -0600 Subject: [PATCH 3/3] Added the steps to sign the CLA agreement to the readme. (#305) --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6f25cc6d..a7474dd9 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@ [![Build Stats](https://buildstats.info/github/chart/splunk/qbec?branch=main)](https://buildstats.info/github/chart/splunk/qbec?branch=main) -Qbec (pronounced like the [Canadian province](https://en.wikipedia.org/wiki/Quebec)) is a CLI tool that -allows you to create Kubernetes objects on multiple Kubernetes clusters or namespaces configured correctly for +Qbec (pronounced like the [Canadian province](https://en.wikipedia.org/wiki/Quebec)) is a CLI tool that +allows you to create Kubernetes objects on multiple Kubernetes clusters or namespaces configured correctly for the target environment in question. -It is based on [jsonnet](https://jsonnet.org) and is similar to other tools in the same space like -[kubecfg](https://github.com/ksonnet/kubecfg) and [ksonnet](https://ksonnet.io/). +It is based on [jsonnet](https://jsonnet.org) and is similar to other tools in the same space like +[kubecfg](https://github.com/ksonnet/kubecfg) and [ksonnet](https://ksonnet.io/). For more info, [read the docs](https://qbec.io/) @@ -25,7 +25,7 @@ Use a prebuilt binary [from the releases page](https://github.com/splunk/qbec/re On MacOS, you can install qbec using homebrew: ``` -$ brew tap splunk/tap +$ brew tap splunk/tap $ brew install qbec ``` @@ -37,3 +37,7 @@ cd qbec make install # installs lint tools etc. make ``` + +### Sign the CLA + +Follow the steps here [cla-assistant](https://github.com/splunk/cla-agreement)