mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-20 21:30:35 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f5665b6c1 | ||
|
|
31a32ab054 | ||
|
|
847208fe8e |
@@ -11,6 +11,6 @@ jobs:
|
||||
name: PR targets branch
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check that the PR targets devel
|
||||
if: ${{ github.base_ref != 'devel' }}
|
||||
- name: Check that the PR targets release-0.22
|
||||
if: ${{ github.base_ref != 'release-0.22' }}
|
||||
run: exit 1
|
||||
|
||||
@@ -29,11 +29,11 @@ jobs:
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.22
|
||||
with:
|
||||
k8s_version: ${{ matrix.k8s_version }}
|
||||
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.22
|
||||
|
||||
@@ -16,8 +16,8 @@ jobs:
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.22
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.22
|
||||
|
||||
@@ -24,10 +24,10 @@ jobs:
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.22
|
||||
with:
|
||||
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.22
|
||||
|
||||
@@ -4,7 +4,7 @@ name: Release Charts
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- devel
|
||||
- release-0.22
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
BASE_BRANCH ?= devel
|
||||
BASE_BRANCH ?= release-0.22
|
||||
export BASE_BRANCH
|
||||
export HELM_REPO_LOCATION=./helm_repo
|
||||
|
||||
@@ -17,7 +17,7 @@ endif
|
||||
export DEPLOYTOOL = helm
|
||||
GH_URL=https://submariner-io.github.io/submariner-charts/charts
|
||||
CHARTS_DIR=charts
|
||||
CHARTS_VERSION=0.22.0-m2
|
||||
CHARTS_VERSION=0.22.0-rc0
|
||||
HELM_DOCS_VERSION=0.15.0
|
||||
REPO_URL=$(shell git config remote.origin.url)
|
||||
|
||||
|
||||
+5
-1
@@ -93,9 +93,13 @@ add_service_acct_ns ${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml
|
||||
cat ${RBAC_BASE}/lighthouse-agent/service_account.yaml \
|
||||
${RBAC_BASE}/lighthouse-agent/cluster_role.yaml \
|
||||
${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml \
|
||||
${RBAC_BASE}/lighthouse-agent/role.yaml \
|
||||
${RBAC_BASE}/lighthouse-agent/role_binding.yaml \
|
||||
${RBAC_BASE}/lighthouse-coredns/service_account.yaml \
|
||||
${RBAC_BASE}/lighthouse-coredns/cluster_role.yaml \
|
||||
${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
|
||||
${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml \
|
||||
${RBAC_BASE}/lighthouse-coredns/role.yaml \
|
||||
${RBAC_BASE}/lighthouse-coredns/role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
|
||||
echo '{{- end -}}' >> ${SERVICE_DISC_RBAC_YAML}
|
||||
|
||||
# Generate the openshift monitoring rbac yaml for the operator chart
|
||||
|
||||
Reference in New Issue
Block a user