Skip to content

Commit

Permalink
backport PSS and PKI delete fix
Browse files Browse the repository at this point in the history
  • Loading branch information
whites11 committed Apr 23, 2024
1 parent 70aa7c1 commit a842ff8
Show file tree
Hide file tree
Showing 19 changed files with 700 additions and 138 deletions.
52 changes: 24 additions & 28 deletions .circleci/config.yml
@@ -1,7 +1,7 @@
version: 2.1

orbs:
architect: giantswarm/architect@4.9.0
architect: giantswarm/architect@5.1.1

workflows:
build:
Expand All @@ -13,53 +13,49 @@ workflows:
tags:
only: /^v.*/

- architect/push-to-docker:
- architect/push-to-registries:
context: architect
name: push-cert-operator-to-quay
image: "quay.io/giantswarm/cert-operator"
username_envar: "QUAY_USERNAME"
password_envar: "QUAY_PASSWORD"
name: push-to-registries
requires:
- go-build
filters:
tags:
only: /^v.*/

- architect/push-to-docker:
context: "architect"
name: push-cert-operator-to-docker
image: "docker.io/giantswarm/cert-operator"
username_envar: "DOCKER_USERNAME"
password_envar: "DOCKER_PASSWORD"
- architect/push-to-app-catalog:
context: architect
name: push-cert-operator-to-control-plane-app-catalog
app_catalog: "control-plane-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "cert-operator"
requires:
- go-build
# Needed to trigger job also on git tag.
- push-to-registries
filters:
tags:
only: /^v.*/

- architect/push-to-docker:
- architect/push-to-app-collection:
context: architect
name: push-cert-operator-to-aliyun
image: "registry-intl.cn-shanghai.aliyuncs.com/giantswarm/cert-operator"
username_envar: "ALIYUN_USERNAME"
password_envar: "ALIYUN_PASSWORD"
name: push-cert-operator-to-aws-app-collection
app_name: "cert-operator"
app_collection_repo: "aws-app-collection"
requires:
- go-build
- push-cert-operator-to-control-plane-app-catalog
filters:
# Trigger the job also on git tag.
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-catalog:
- architect/push-to-app-collection:
context: architect
name: push-cert-operator-to-control-plane-app-catalog
app_catalog: "control-plane-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "cert-operator"
name: push-cert-operator-to-azure-app-collection
app_name: "cert-operator"
app_collection_repo: "azure-app-collection"
requires:
- push-cert-operator-to-aliyun
- push-cert-operator-to-quay
- push-cert-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
36 changes: 0 additions & 36 deletions .github/dependabot.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .github/pull_request_template.md
@@ -0,0 +1,3 @@
## Checklist

- [ ] Update changelog in CHANGELOG.md.
2 changes: 1 addition & 1 deletion .github/workflows/tidy.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3.6.0
-
# https://github.com/actions/checkout/issues/6
name: Fix detached HEAD
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/zz_generated.add-team-labels.yaml
@@ -0,0 +1,53 @@
name: Add appropriate labels to issue

on:
issues:
types: [assigned]

jobs:
build_user_list:
name: Get yaml config of GS users
runs-on: ubuntu-latest
steps:
- name: Get user-mapping
run: |
mkdir -p artifacts
wget --header "Authorization: token ${{ secrets.ISSUE_AUTOMATION }}" \
-O artifacts/users.yaml \
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: users
path: artifacts/users.yaml
retention-days: 1

add_label:
name: Add team label when assigned
runs-on: ubuntu-latest
needs: build_user_list
steps:
- uses: actions/download-artifact@v4
id: download-users
with:
name: users
- name: Find team label based on user names
run: |
event_assignee=$(cat $GITHUB_EVENT_PATH | jq -r .assignee.login | tr '[:upper:]' '[:lower:]')
echo "Issue assigned to: ${event_assignee}"
TEAMS=$(cat ${{steps.download-users.outputs.download-path}}/users.yaml | tr '[:upper:]' '[:lower:]' | yq ".${event_assignee}.teams" -o csv | tr ',' ' ')
echo "LABEL<<EOF" >> $GITHUB_ENV
for team in ${TEAMS}; do
echo "Team: ${team} | Label: team/${team}"
echo "team/${team}" >> $GITHUB_ENV
done
echo "EOF" >> $GITHUB_ENV
- name: Apply label to issue
if: ${{ env.LABEL != '' && env.LABEL != 'null' && env.LABEL != null }}
uses: actions-ecosystem/action-add-labels@v1
with:
github_token: ${{ secrets.ISSUE_AUTOMATION }}
labels: |
${{ env.LABEL }}
89 changes: 89 additions & 0 deletions .github/workflows/zz_generated.add-to-project-board.yaml
@@ -0,0 +1,89 @@
name: Add Issue to Project when assigned

on:
issues:
types:
- assigned
- labeled

jobs:
build_user_list:
name: Get yaml config of GS users
runs-on: ubuntu-latest
steps:
- name: Get user-mapping
run: |
mkdir -p artifacts
wget --header "Authorization: token ${{ secrets.ISSUE_AUTOMATION }}" \
-O artifacts/users.yaml \
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: users
path: artifacts/users.yaml
retention-days: 1
- name: Get label-mapping
run: |
mkdir -p artifacts
wget --header "Authorization: token ${{ secrets.ISSUE_AUTOMATION }}" \
-O artifacts/labels.yaml \
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/label-mapping.yaml
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: labels
path: artifacts/labels.yaml
retention-days: 1

add_to_personal_board:
name: Add issue to personal board
runs-on: ubuntu-latest
needs: build_user_list
if: github.event.action == 'assigned'
steps:
- uses: actions/download-artifact@v4
id: download-users
with:
name: users
- name: Find personal board based on user names
run: |
event_assignee=$(cat $GITHUB_EVENT_PATH | jq -r .assignee.login | tr '[:upper:]' '[:lower:]')
echo "Issue assigned to: ${event_assignee}"
BOARD=($(cat ${{steps.download-users.outputs.download-path}}/users.yaml | tr '[:upper:]' '[:lower:]' | yq ".${event_assignee}.personalboard"))
echo "Personal board URL: ${BOARD}"
echo "BOARD=${BOARD}" >> $GITHUB_ENV
- name: Add issue to personal board
if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }}
uses: actions/add-to-project@main
with:
project-url: ${{ env.BOARD }}
github-token: ${{ secrets.ISSUE_AUTOMATION }}

add_to_team_board:
name: Add issue to team board
runs-on: ubuntu-latest
needs: build_user_list
if: github.event.action == 'labeled'
steps:
- uses: actions/download-artifact@v4
id: download-labels
with:
name: labels
- name: Find team board based on label
run: |
event_label=$(cat $GITHUB_EVENT_PATH | jq -r .label.name | tr '[:upper:]' '[:lower:]')
echo "Issue labelled with: ${event_label}"
BOARD=($(cat ${{steps.download-labels.outputs.download-path}}/labels.yaml | tr '[:upper:]' '[:lower:]' | yq ".[\"${event_label}\"].projectboard"))
echo "Team board URL: ${BOARD}"
echo "BOARD=${BOARD}" >> $GITHUB_ENV
- name: Add issue to team board
if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }}
uses: actions/add-to-project@main
with:
project-url: ${{ env.BOARD }}
github-token: ${{ secrets.ISSUE_AUTOMATION }}
53 changes: 53 additions & 0 deletions .github/workflows/zz_generated.check_values_schema.yaml
@@ -0,0 +1,53 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.23.3
#
name: 'Values and schema'
on:
pull_request:
branches:
- master
- main
paths:
- 'helm/**/values.yaml' # default helm chart values
- 'helm/**/values.schema.json' # schema
- 'helm/**/ci/ci-values.yaml' # overrides for CI (can contain required entries)

push: {}

jobs:
check:
name: 'validate values.yaml against values.schema.json'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

- name: Install validator
run: |
wget -q -O ${HOME}/yajsv https://github.com/neilpa/yajsv/releases/download/v1.4.1/yajsv.linux.amd64
chmod +x ${HOME}/yajsv
- name: 'Check if values.yaml is a valid instance of values.schema.json'
run: |
for chart_yaml in helm/*/Chart.yaml; do
helm_dir="${chart_yaml%/Chart.yaml}"
if [ ! -f ${helm_dir}/values.schema.json ]; then
echo "Skipping validation for '${helm_dir}' folder, because 'values.schema.json' does not exist..."
continue
fi
values=${helm_dir}/values.yaml
if [ -f ${helm_dir}/ci/ci-values.yaml ]; then
# merge ci-values.yaml into values.yaml (providing required values)
echo -e "\nMerged values:\n=============="
yq '. *= load("'${helm_dir}'/ci/ci-values.yaml")' ${helm_dir}/values.yaml | tee ${helm_dir}/combined-values.yaml
echo -e "\n==============\n"
values=${helm_dir}/combined-values.yaml
fi
${HOME}/yajsv -s ${helm_dir}/values.schema.json ${values}
done

0 comments on commit a842ff8

Please sign in to comment.