From a0002ecbec475db83c2ae99df0d9ada1768b9468 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Tue, 7 Dec 2021 16:57:20 +0000 Subject: [PATCH 1/2] Generated commit to update templated files based on rev 6fb0de4 in stackabletech/operator-templating repo. Original commit message: Skip update manifest gh actions for pull requests that originate from forks (#29) * Skip update manifest gh actions for pull requests that originate from forks and do not have access to the necessary secrets. * Add bors configuration. --- .github/workflows/pr_generate_manifests.yml | 6 ++++++ .github/workflows/rust.yml | 6 +++--- bors.toml | 10 ++++++++++ deploy/helm/hdfs-operator/Chart.yaml | 9 +++++++-- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 bors.toml diff --git a/.github/workflows/pr_generate_manifests.yml b/.github/workflows/pr_generate_manifests.yml index 8ea9b183..c480eedf 100644 --- a/.github/workflows/pr_generate_manifests.yml +++ b/.github/workflows/pr_generate_manifests.yml @@ -20,8 +20,14 @@ jobs: with: version: v3.6.2 - name: update manifests + env: + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + if: env.NEXUS_PASSWORD != null run: make generate-manifests - name: Add & Commit + env: + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + if: env.NEXUS_PASSWORD != null uses: EndBug/add-and-commit@v7 with: default_author: user_info diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 52f25e95..d4bec303 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,6 +8,8 @@ on: push: branches: - main + - staging + - trying pull_request: env: @@ -32,9 +34,6 @@ jobs: - uses: actions-rs/cargo@v1.0.3 with: command: test - - uses: actions-rs/cargo@v1.0.3 - with: - command: clean rustfmt: name: Run rustfmt @@ -80,6 +79,7 @@ jobs: toolchain: stable components: clippy override: true + - uses: Swatinem/rust-cache@v1.3.0 # We need this due to: https://github.com/actions-rs/clippy-check/issues/2 - name: Check workflow permissions id: check_permissions diff --git a/bors.toml b/bors.toml new file mode 100644 index 00000000..2ce6da66 --- /dev/null +++ b/bors.toml @@ -0,0 +1,10 @@ +status = [ + 'Run tests', + 'Run rustfmt', + 'Run rustdoc', + 'Run clippy', + 'Run cargo deny (bans licenses sources)' +] +delete_merged_branches = true +pr_status = [ 'license/cla' ] +timeout_sec = 7200 \ No newline at end of file diff --git a/deploy/helm/hdfs-operator/Chart.yaml b/deploy/helm/hdfs-operator/Chart.yaml index e69d6afe..06c87e7d 100644 --- a/deploy/helm/hdfs-operator/Chart.yaml +++ b/deploy/helm/hdfs-operator/Chart.yaml @@ -2,9 +2,11 @@ # This file is automatically generated from the templates in stackabletech/operator-templating # DON'T MANUALLY EDIT THIS FILE # ============= + apiVersion: v2 name: hdfs-operator description: The Stackable Operator for Apache HDFS + # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -14,15 +16,18 @@ description: The Stackable Operator for Apache HDFS # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application + maintainers: - name: stackable url: github.com/stackabletech + # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0-nightly +version: + # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.3.0-nightly +appVersion: From f782dcfdb4d72041634c3c252637428b169d3694 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Tue, 7 Dec 2021 17:06:27 +0000 Subject: [PATCH 2/2] Github Actions: Generated k8s manifest files --- deploy/helm/hdfs-operator/Chart.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/deploy/helm/hdfs-operator/Chart.yaml b/deploy/helm/hdfs-operator/Chart.yaml index 06c87e7d..e69d6afe 100644 --- a/deploy/helm/hdfs-operator/Chart.yaml +++ b/deploy/helm/hdfs-operator/Chart.yaml @@ -2,11 +2,9 @@ # This file is automatically generated from the templates in stackabletech/operator-templating # DON'T MANUALLY EDIT THIS FILE # ============= - apiVersion: v2 name: hdfs-operator description: The Stackable Operator for Apache HDFS - # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -16,18 +14,15 @@ description: The Stackable Operator for Apache HDFS # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application - maintainers: - name: stackable url: github.com/stackabletech - # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: - +version: 0.3.0-nightly # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: +appVersion: 0.3.0-nightly