Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable SRP action from Kubeapps #7064

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Disable SRP action from Kubeapps #7064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe4e691
Disable SRP action from Kubeapps
ppbaena Nov 10, 2023
9efb59f
Remove SRP variables
ppbaena Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 0 additions & 91 deletions .github/actions/srp-source-provenance/action.yml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions .github/workflows/kubeapps-general.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ env:
GKE_ZONE: "us-east1-c"
GKE_PROJECT: "vmware-kubeapps-ci"
GKE_CLUSTER: "kubeapps-test"
SRP_CLI_VERSION: "0.9.9-20230724044630-61ef470-169"

jobs:
setup:
Expand Down Expand Up @@ -592,20 +591,6 @@ jobs:
docker push $prod_image
done

srp_report:
needs:
- setup
- push_images
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/srp-source-provenance
with:
SRP_CLI_VERSION: ${{env.SRP_CLI_VERSION}}
SRP_CLIENT_ID: ${{secrets.SRP_CLIENT_ID}}
SRP_CLIENT_SECRET: ${{secrets.SRP_CLIENT_SECRET}}
Comment on lines -604 to -606
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should delete these vars (SRP_CLI_VERSION, SRP_CLIENT_ID and SRP_CLIENT_SECRET) from other places as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

VERSION: ${{needs.setup.outputs.version}}

sync_chart_from_bitnami:
needs:
- setup
Expand Down
1 change: 0 additions & 1 deletion site/content/docs/latest/reference/developer/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ The versions used there _must_ match the ones used for building the container im
- `KIND_VERSION` should be updated with the [latest stable version from the kind releases](https://github.com/kubernetes-sigs/kind/releases).
- `K8S_KIND_VERSION` _must_ match the Kubernetes minor version used in `GKE_REGULAR_VERSION_XX` and should be updated with one of the available image tags for a given [Kind release](https://github.com/kubernetes-sigs/kind/releases).
- `POSTGRESQL_VERSION` _must_ match the version used by the [Bitnami PostgreSQL chart](https://github.com/bitnami/charts/blob/main/bitnami/postgresql/Chart.yaml).
- `SRP_CLI_VERSION` _should_ be up to date according to the [latest stable version from the SRP CLI builds](https://vmwaresaas.jfrog.io/ui/native/srp-tools/srpcli).

Besides, the `GKE_STABLE_VERSION` and the `GKE_REGULAR_VERSION` might have to be updated if the _Stable_ and _Regular_ Kubernetes versions in GKE have changed. Check this information on [this GKE release notes website](https://cloud.google.com/kubernetes-engine/docs/release-notes).

Expand Down
1 change: 0 additions & 1 deletion site/content/docs/latest/reference/testing/ci.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ job uses a matrix to parameterize and parallelize the `local_e2e_tests` job, so
(carvel, flux, main, etc), and we would need to configure a status check in the branch protections rules for every item in the matrix.
* `push_images`: each time a new commit is pushed to the main branch or a new version tag is created, the CI images
(which have already been built) get re-tagged and pushed to the `kubeapps` account in Dockerhub.
* `srp_report`: it generates and submits the source provenance file, required to comply with the SRP (Secure Release Pipeline) requirements.
* `sync_chart_from_bitnami`: each time a new commit is pushed to the main branch, it brings the current changes in the upstream
[bitnami/charts repository](https://github.com/bitnami/charts/tree/main/bitnami/kubeapps) and merges the changes. This step involves:
* Checking if the Bitnami chart version is greater than the Kubeapps development chart version. If not, stop.
Expand Down
Loading