Compare commits

..
11 Commits
Author SHA1 Message Date
Tom Pantelis d91eae8312 Mark the source directory as safe
See https://github.blog/2022-04-12-git-security-vulnerability-announced/
for context. git now refuses to handle repositories which don't belong
to the current user by default; such repositories need to be
explicitly marked as safe, in the global configuration for the current user.

This fixes the failing release job.

Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
2022-06-09 10:28:21 -04:00
dependabot[bot]andThomas Pantelis da4a2709f1 Bump actions/setup-python from 3.1.2 to 4
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3.1.2 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/98f2ad02fd48d057ee3b4d4f66525b231c3e52b6...d09bd5e6005b175076f227b13d9730d56e9dcfcb)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-09 07:38:35 -04:00
dependabot[bot]andThomas Pantelis 9fa73fb79a Bump actions/checkout from 2.3.4 to 3.0.2
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 3.0.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f...2541b1294d2704b0964813337f33b291d3f8596b)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-19 07:37:20 -04:00
dependabot[bot]andThomas Pantelis 06379643b8 Bump ibiqlik/action-yamllint from 3.0.4 to 3.1
Bumps [ibiqlik/action-yamllint](https://github.com/ibiqlik/action-yamllint) from 3.0.4 to 3.1.
- [Release notes](https://github.com/ibiqlik/action-yamllint/releases)
- [Commits](https://github.com/ibiqlik/action-yamllint/compare/ed2b6e911569708ed121c14b87d513860a7e36a7...81e214fd484713882ce4237cb7cd264d550856cf)

---
updated-dependencies:
- dependency-name: ibiqlik/action-yamllint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-19 07:13:33 -04:00
Daniel FarrellandThomas Pantelis 629e48f944 Bump markdown-link-check to the current tip
This hasn't been released yet but fixes the safe directories git
errors.

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
2022-05-19 07:02:45 -04:00
dependabot[bot]andThomas Pantelis 5caa6c7997 Bump z0al/dependent-issues
Bumps [z0al/dependent-issues](https://github.com/z0al/dependent-issues) from 70a1b2d4ee1cdc743af33498bd0204123953a887 to 1.5.1. This release includes the previously tagged commit.
- [Release notes](https://github.com/z0al/dependent-issues/releases)
- [Commits](https://github.com/z0al/dependent-issues/compare/70a1b2d4ee1cdc743af33498bd0204123953a887...0fae07162bc9e0d8e116a133bd03686eed6efa21)

---
updated-dependencies:
- dependency-name: z0al/dependent-issues
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-18 08:55:27 -04:00
dependabot[bot]andThomas Pantelis 4161982f7b Bump peter-evans/create-issue-from-file from 3.0.0 to 4
Bumps [peter-evans/create-issue-from-file](https://github.com/peter-evans/create-issue-from-file) from 3.0.0 to 4.
- [Release notes](https://github.com/peter-evans/create-issue-from-file/releases)
- [Commits](https://github.com/peter-evans/create-issue-from-file/compare/97e6f902a416aac38834e23fa52e166aad0437d2...99b87c35610e986ad2034a7b0518a9b3ebea541b)

---
updated-dependencies:
- dependency-name: peter-evans/create-issue-from-file
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-18 08:02:18 -04:00
dependabot[bot]andThomas Pantelis e4a2e0374b Bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0
Bumps [tim-actions/get-pr-commits](https://github.com/tim-actions/get-pr-commits) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/tim-actions/get-pr-commits/releases)
- [Commits](https://github.com/tim-actions/get-pr-commits/compare/55b867b9b28954e6f5c1a0fe2f729dc926c306d0...c64db31d359214d244884dd68f971a110b29ab83)

---
updated-dependencies:
- dependency-name: tim-actions/get-pr-commits
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-18 07:55:56 -04:00
dependabot[bot]andThomas Pantelis 20b0c70a61 Bump actions/setup-python from 2.2.2 to 3.1.2
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.2.2 to 3.1.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/dc73133d4da04e56a135ae2246682783cc7c7cb6...98f2ad02fd48d057ee3b4d4f66525b231c3e52b6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-18 07:18:23 -04:00
dependabot[bot]andThomas Pantelis 0e639cb9a3 Bump helm/chart-testing-action from 2.1.0 to 2.2.1
Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/5f16c27cf7a4fa9c776ff73734df3909b2b65127...dae259e86a35ff09145c0805e2d7dd3f7207064a)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-18 07:17:58 -04:00
Automated Release c15111b329 Update base image to use stable branch 'release-0.12'
Signed-off-by: Automated Release <release@submariner.io>
2022-03-02 10:16:16 +00:00
16 changed files with 191 additions and 195 deletions
-7
View File
@@ -1,7 +0,0 @@
---
version: 2
updates:
- package-ecosystem: github-actions
directory: '/'
schedule:
interval: daily
+2 -2
View File
@@ -9,6 +9,6 @@ jobs:
name: PR targets branch name: PR targets branch
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check that the PR targets devel - name: Check that the PR targets release-0.12
if: ${{ github.base_ref != 'devel' }} if: ${{ github.base_ref != 'release-0.12' }}
run: exit 1 run: exit 1
+1 -1
View File
@@ -17,7 +17,7 @@ on:
- reopened - reopened
- synchronize - synchronize
schedule: schedule:
- cron: '0 0/6 * * *' # every 6 hours - cron: '0 0/6 * * *' # every 6 hours
jobs: jobs:
check: check:
+3 -2
View File
@@ -19,6 +19,7 @@ jobs:
k8s_version: ['1.23'] k8s_version: ['1.23']
lighthouse: ['', 'lighthouse'] lighthouse: ['', 'lighthouse']
include: include:
- k8s_version: '1.20'
- k8s_version: '1.21' - k8s_version: '1.21'
- k8s_version: '1.22' - k8s_version: '1.22'
steps: steps:
@@ -26,11 +27,11 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run E2E deployment and tests - name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
with: with:
k8s_version: ${{ matrix.k8s_version }} k8s_version: ${{ matrix.k8s_version }}
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }} using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
- name: Post mortem - name: Post mortem
if: failure() if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12
+2 -2
View File
@@ -14,8 +14,8 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run E2E deployment and tests - name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
- name: Post mortem - name: Post mortem
if: failure() if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12
+2 -2
View File
@@ -22,10 +22,10 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run E2E deployment and tests - name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
with: with:
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }} using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
- name: Post mortem - name: Post mortem
if: failure() if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12
+8 -4
View File
@@ -39,12 +39,12 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Set up Helm - name: Set up Helm
uses: azure/setup-helm@217bf70cbd2e930ba2e81ba7e1de2f7faecc42ba uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab
with: with:
version: v3.6.0 version: v3.6.0
- name: Set up Python - name: Set up Python
uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6 uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
with: with:
python-version: '3.x' python-version: '3.x'
@@ -83,7 +83,7 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run markdown-link-check - name: Run markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@58f84fd654812d0d8da4e4d4a559eda087daf8ce uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
with: with:
config-file: ".markdownlinkcheck.json" config-file: ".markdownlinkcheck.json"
check-modified-files-only: "yes" check-modified-files-only: "yes"
@@ -105,4 +105,8 @@ jobs:
- name: Check out the repository - name: Check out the repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run yamllint - name: Run yamllint
run: make yamllint uses: ibiqlik/action-yamllint@81e214fd484713882ce4237cb7cd264d550856cf
with:
file_or_dir: submariner-k8s-broker/Chart.yaml submariner-k8s-broker/values.yaml submariner-operator/Chart.yaml submariner-operator/values.yaml
config_file: .yamllint.yml
strict: true
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run markdown-link-check - name: Run markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@58f84fd654812d0d8da4e4d4a559eda087daf8ce uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
with: with:
config-file: ".markdownlinkcheck.json" config-file: ".markdownlinkcheck.json"
+1 -1
View File
@@ -4,7 +4,7 @@ name: Release Charts
on: on:
push: push:
branches: branches:
- devel - release-0.12
jobs: jobs:
release: release:
-1
View File
@@ -1,4 +1,3 @@
---
label-approved: label-approved:
approvals: 2 approvals: 2
label: ready-to-test label: ready-to-test
+11 -11
View File
@@ -1,15 +1,15 @@
--- ---
extends: default extends: default
rules: rules:
comments: disable
comments-indentation: disable
line-length: line-length:
max: 140 max: 150
# Allow standard GHA syntax for "on: *" braces:
truthy: min-spaces-inside: 0
ignore: '.github/workflows/*.yml' max-spaces-inside: 0
brackets:
ignore: | min-spaces-inside: 0
/submariner-k8s-broker/crds max-spaces-inside: 0
/submariner-operator/crds indentation:
/submariner-k8s-broker/templates indent-sequences: consistent
/submariner-operator/templates
+2
View File
@@ -9,6 +9,8 @@ ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output PATH=${DAPPER_SOURCE}/bin/:${PATH}
WORKDIR ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE}
RUN git config --global --add safe.directory ${DAPPER_SOURCE}
# Override the Helm deployment scripts # Override the Helm deployment scripts
COPY deploy_helm /opt/shipyard/scripts/lib/ COPY deploy_helm /opt/shipyard/scripts/lib/
+1 -1
View File
@@ -1,4 +1,4 @@
BASE_BRANCH ?= devel BASE_BRANCH ?= release-0.12
export BASE_BRANCH export BASE_BRANCH
ifneq (,$(DAPPER_HOST_ARCH)) ifneq (,$(DAPPER_HOST_ARCH))
-1
View File
@@ -1,4 +1,3 @@
---
charts: charts:
- submariner-operator - submariner-operator
- submariner-k8s-broker - submariner-k8s-broker
+18 -19
View File
@@ -1,20 +1,19 @@
---
questions: questions:
- variable: submariner-k8s-broker.rbac.create - variable: submariner-k8s-broker.rbac.create
type: boolean type: boolean
default: true default: true
group: "Role Based Access Control" group: "Role Based Access Control"
description: "Create the role/rolebinding for the Submariner client" description: "Create the role/rolebinding for the Submariner client"
label: "RBAC Creation Enabled" label: "RBAC Creation Enabled"
- variable: submariner-k8s-broker.crd.create - variable: submariner-k8s-broker.crd.create
type: boolean type: boolean
default: true default: true
group: "Submariner CRD" group: "Submariner CRD"
description: "Create the submariner CRDs for the Submariner client" description: "Create the submariner CRDs for the Submariner client"
label: "Submariner CRD Creation Enabled" label: "Submariner CRD Creation Enabled"
- variable: submariner-k8s-broker.serviceAccounts.client.create - variable: submariner-k8s-broker.serviceAccounts.client.create
type: boolean type: boolean
default: true default: true
group: "Service Account" group: "Service Account"
description: "Create the service account for the Submariner client" description: "Create the service account for the Submariner client"
label: "Submariner Service Account Creation Enabled" label: "Submariner Service Account Creation Enabled"
+139 -140
View File
@@ -1,145 +1,144 @@
---
questions: questions:
- variable: defaultOperatorImage - variable: defaultOperatorImage
default: true default: true
description: "Use default Submariner operator image or specify a custom one" description: "Use default Submariner operator image or specify a custom one"
label: Use default Submariner operator image label: Use default Submariner operator image
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images" group: "Container Images"
subquestions: subquestions:
- variable: operator.image.repository - variable: operator.image.repository
default: "quay.io/submariner/submariner-operator" default: "quay.io/submariner/submariner-operator"
description: "Submariner Operator Image Repository" description: "Submariner Operator Image Repository"
type: string type: string
label: Submariner Operator Image Repository label: Submariner Operator Image Repository
- variable: operator.image.tag - variable: operator.image.tag
default: "0.10.1" default: "0.10.1"
description: "Submariner Operator Image Tag" description: "Submariner Operator Image Tag"
type: string type: string
label: Submariner Operator Image Tag label: Submariner Operator Image Tag
- variable: defaultSubmarinerImages - variable: defaultSubmarinerImages
default: true default: true
description: "Use default Submariner images or specify custom ones" description: "Use default Submariner images or specify custom ones"
label: Use default Submariner images label: Use default Submariner images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container images" group: "Container images"
subquestions: subquestions:
- variable: submariner.images.repository - variable: submariner.images.repository
default: "quay.io/submariner" default: "quay.io/submariner"
description: "Submariner Repository (base for all non-operator images)" description: "Submariner Repository (base for all non-operator images)"
type: string type: string
label: Submariner Repository label: Submariner Repository
- variable: submariner.images.tag - variable: submariner.images.tag
default: "0.10.1" default: "0.10.1"
description: "Submariner Images Tag (shared for all non-operator images)" description: "Submariner Images Tag (shared for all non-operator images)"
type: string type: string
label: Submariner Images Tag label: Submariner Images Tag
- variable: submariner.clusterId - variable: submariner.clusterId
default: ""
description: "Enter a unique cluster ID to identify this cluster"
type: string
label: "Cluster ID"
group: "Configuration"
required: true
- variable: ipsec.psk
default: ""
description: "Enter the pre-shared key for the IPsec Cable Engine"
type: string
label: "IPsec Pre-Shared Key"
group: "Configuration"
required: true
- variable: broker.server
type: string
default: ""
group: "Broker Configuration"
label: "Broker Server"
description: "Broker server to use (without the https://)"
- variable: broker.insecure
type: boolean
default: false
show_subquestion_if: false
group: "Broker Configuration"
label: "Insecure Broker"
description: "Connect to K8s broker without validating CA"
subquestions:
- variable: broker.ca
type: string
description: "Base64 encoded broker ca.crt"
label: "Broker CA encoded in base64"
default: "" default: ""
description: "Enter a unique cluster ID to identify this cluster" - variable: broker.token
type: string type: string
label: "Cluster ID" group: "Broker Configuration"
group: "Configuration" label: "Broker Token"
required: true description: "Bearer token for broker"
- variable: ipsec.psk - variable: broker.namespace
type: string
group: "Broker Configuration"
label: "Broker Namespace"
description: "Enter namespace to use on central broker"
- variable: submariner.clusterCidr
default: ""
description: "Enter the cluster CIDR (i.e. 10.42.0.0/16) for this cluster"
type: string
label: "Cluster CIDR"
group: "CIDR Configuration"
required: true
- variable: submariner.serviceCidr
default: ""
description: "Enter the service CIDR (i.e. 10.43.0.0/16) for this cluster"
type: string
label: "Service CIDR"
group: "CIDR Configuration"
required: true
- variable: submariner.serviceDiscovery
type: boolean
default: false
group: "Advanced Configuration"
description: "Enable multicluster service discovery"
label: "Service Discovery Enabled"
- variable: broker.globalnet
type: boolean
default: false
group: "Broker Configuration"
description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters"
label: "Globalnet Enabled"
subquestions:
- variable: submariner.globalCidr
default: "" default: ""
description: "Enter the pre-shared key for the IPsec Cable Engine" description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
type: string type: string
label: "IPsec Pre-Shared Key" label: "Globalnet CIDR"
group: "Configuration"
required: true
- variable: broker.server
type: string
default: ""
group: "Broker Configuration"
label: "Broker Server"
description: "Broker server to use (without the https://)"
- variable: broker.insecure
type: boolean
default: false
show_subquestion_if: false
group: "Broker Configuration"
label: "Insecure Broker"
description: "Connect to K8s broker without validating CA"
subquestions:
- variable: broker.ca
type: string
description: "Base64 encoded broker ca.crt"
label: "Broker CA encoded in base64"
default: ""
- variable: broker.token
type: string
group: "Broker Configuration"
label: "Broker Token"
description: "Bearer token for broker"
- variable: broker.namespace
type: string
group: "Broker Configuration"
label: "Broker Namespace"
description: "Enter namespace to use on central broker"
- variable: submariner.clusterCidr
default: ""
description: "Enter the cluster CIDR (i.e. 10.42.0.0/16) for this cluster"
type: string
label: "Cluster CIDR"
group: "CIDR Configuration" group: "CIDR Configuration"
required: true required: false
- variable: submariner.serviceCidr - variable: submariner.natEnabled
default: "" type: boolean
description: "Enter the service CIDR (i.e. 10.43.0.0/16) for this cluster" default: false
type: string group: "Advanced Configuration"
label: "Service CIDR" description: "If the gateway nodes for this cluster are behind 1:1 NAT, you should enable NAT"
group: "CIDR Configuration" label: "NAT Enabled"
required: true - variable: submariner.debug
- variable: submariner.serviceDiscovery type: boolean
type: boolean default: false
default: false group: "Advanced Configuration"
group: "Advanced Configuration" description: "Enable submariner debug mode"
description: "Enable multicluster service discovery" label: "Submariner Debug Enabled"
label: "Service Discovery Enabled" - variable: ipsec.debug
- variable: broker.globalnet type: boolean
type: boolean default: false
default: false group: "Advanced Configuration"
group: "Broker Configuration" description: "Enable Charon debug mode"
description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters" label: "Charon Enabled"
label: "Globalnet Enabled" - variable: submariner.cableDriver
subquestions: type: string
- variable: submariner.globalCidr default: ""
default: "" group: "Advanced Configuration"
description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet" description: "Cable driver implementation"
type: string label: "Cable Driver"
label: "Globalnet CIDR" - variable: submariner.healthcheckEnabled
group: "CIDR Configuration" type: boolean
required: false default: true
- variable: submariner.natEnabled group: "Advanced Configuration"
type: boolean description: "Disable Healthcheck"
default: false label: "Healthcheck Disabled"
group: "Advanced Configuration"
description: "If the gateway nodes for this cluster are behind 1:1 NAT, you should enable NAT"
label: "NAT Enabled"
- variable: submariner.debug
type: boolean
default: false
group: "Advanced Configuration"
description: "Enable submariner debug mode"
label: "Submariner Debug Enabled"
- variable: ipsec.debug
type: boolean
default: false
group: "Advanced Configuration"
description: "Enable Charon debug mode"
label: "Charon Enabled"
- variable: submariner.cableDriver
type: string
default: ""
group: "Advanced Configuration"
description: "Cable driver implementation"
label: "Cable Driver"
- variable: submariner.healthcheckEnabled
type: boolean
default: true
group: "Advanced Configuration"
description: "Disable Healthcheck"
label: "Healthcheck Disabled"