Compare commits

...
18 Commits
Author SHA1 Message Date
dependabot[bot]andThomas Pantelis 883d93c0be Bump helm/chart-testing-action from 2.2.1 to 2.3.0
Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/dae259e86a35ff09145c0805e2d7dd3f7207064a...09ed88797198755e5031f25be13da255e7e33aad)

---
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-08-11 07:29:11 -04:00
dependabot[bot]andDaniel Farrell 414c72fc28 Bump actions/setup-python from 4.1.0 to 4.2.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/c4e89fac7e8767b327bbad6cb4d859eda999cf08...b55428b1882923874294fa556849718a1d7f2ca5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-03 17:16:56 -04:00
Mike KolesnikandThomas Pantelis 2f1cd8d728 Use ENV vars instead of flags
Switch to using Shipyard's ENV vars instead of flags, much simpler to
understand.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
2022-08-01 09:41:47 -04:00
Thomas PantelisandGitHub d667fc2546 Add submariner-gateway role permissions for leases (#247)
This is needed for leader election resource locking in K8s 0.24.

Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
2022-07-28 07:21:29 +03:00
Stephen KittandDaniel Farrell a1b5d7f20a Bump the broker to 0.13.0-rc2
Signed-off-by: Stephen Kitt <skitt@redhat.com>
2022-07-15 14:26:58 -04:00
Mike KolesnikandStephen Kitt 85b746dd4c Use Shipyard's deployment of helm
Instead of using a copy of the deploy file, use Shipyard's deploy as it
could (and does) diverge.

This also obviates the need for a copy of `Dockerfile.dapper` which
can now be taken directly from Shipyard.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
2022-07-15 16:41:13 +02:00
Stephen KittandThomas Pantelis e6c1600270 Bump to 0.13.0-rc2
This will ensure that we deploy the current development version of
Submariner and that our artifacts are considered the latest (currently
our latest is 0.11.2!).

Signed-off-by: Stephen Kitt <skitt@redhat.com>
2022-07-14 11:43:42 -04:00
dependabot[bot]andThomas Pantelis 9e5b80abda Bump actions/setup-python from 4.0.0 to 4.1.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/d09bd5e6005b175076f227b13d9730d56e9dcfcb...c4e89fac7e8767b327bbad6cb4d859eda999cf08)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-12 10:37:19 -04:00
Daniel FarrellandThomas Pantelis 077c26b714 Add K8s 1.24 E2E, EoL K8s 1.21
Use Kubernetes 1.24 as the default version for end-to-end tests.

Remove Kubernetes 1.21 end-to-end tests as it's end of life.

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
2022-07-07 15:13:50 -04:00
Mike KolesnikandThomas Pantelis 7f4648985e Use minimal clusters for E2E
We don't really need to run the entire E2E suite anymore since we're
deploying the operator and it takes care of the entire deployment cycle.
Hence, the testing on operator should suffice and the helm testing can
be much slimmer and only use 2 single-node clusters.

This won't run the non-gw node tests, but as it's all tested on the
operator anyhow, there's no need to re-test it here.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
2022-07-07 12:07:07 -04:00
Stephen KittandThomas Pantelis c605528741 Create secrets along with SAs
Starting with Kubernetes 1.24, secrets are no longer automatically
created for SAs. This adds secrets to the relevant templates; creating
secrets in this way is supported in all Kubernetes versions.

This also enables testing with 1.24 in CI, to make sure that the fix
actually works.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
2022-07-07 11:54:23 -04:00
Stephen KittandGitHub d3a4507650 Allow dependabot upgrades on release-0.13 (#234)
Signed-off-by: Stephen Kitt <skitt@redhat.com>
2022-06-29 11:48:39 +00:00
dependabot[bot]andThomas Pantelis b4cb05ee93 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-13 13:28:08 -04:00
Tom Pantelis f4510d182a 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-05-19 16:51:05 -04:00
Daniel FarrellandStephen Kitt 1ba50d5028 Use Dependabot to update GHAs on release-0.12
Add Dependabot configuration to automatically update GitHub Actions on
the release-0.12 branch.

This will facilitate quick updates while using SHA-based versions.

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
2022-05-18 09:45:07 +02:00
Daniel FarrellandThomas Pantelis 440cb58639 Link to result of link redirect
This link does a redirect to the new one.

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
2022-05-16 08:42:14 -04:00
Daniel FarrellandThomas Pantelis 3cad34678b Ignore docs.github.com URLs as they always 403
All docs.github.com URLs return 403 Forbidden, although they work.

This seems to be a new behavior, as it was working less than a week ago.

This happens in CI across submariner-io repos and locally.

$ curl -I https://docs.github.com/
HTTP/2 403

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
2022-05-16 08:42:14 -04:00
Daniel FarrellandThomas Pantelis b7e87f6f03 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-12 05:21:55 -04:00
22 changed files with 111 additions and 133 deletions
+10
View File
@@ -5,3 +5,13 @@ updates:
directory: '/'
schedule:
interval: daily
- package-ecosystem: github-actions
directory: '/'
target-branch: "release-0.12"
schedule:
interval: daily
- package-ecosystem: github-actions
directory: '/'
target-branch: "release-0.13"
schedule:
interval: daily
+2 -2
View File
@@ -16,11 +16,11 @@ jobs:
matrix:
cable_driver: ['libreswan', 'wireguard', 'vxlan']
globalnet: ['', 'globalnet']
k8s_version: ['1.23']
k8s_version: ['1.24']
lighthouse: ['', 'lighthouse']
include:
- k8s_version: '1.21'
- k8s_version: '1.22'
- k8s_version: '1.23'
steps:
- name: Check out the repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+3 -3
View File
@@ -44,12 +44,12 @@ jobs:
version: v3.6.0
- name: Set up Python
uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5
with:
python-version: '3.x'
- name: Set up helm/chart-testing
uses: helm/chart-testing-action@dae259e86a35ff09145c0805e2d7dd3f7207064a
uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad
- name: Run helm/chart-testing (lint)
run: ct lint --config ct.yaml
@@ -83,7 +83,7 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@58f84fd654812d0d8da4e4d4a559eda087daf8ce
uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
with:
config-file: ".markdownlinkcheck.json"
check-modified-files-only: "yes"
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Run markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@58f84fd654812d0d8da4e4d4a559eda087daf8ce
uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
with:
config-file: ".markdownlinkcheck.json"
+1
View File
@@ -3,3 +3,4 @@
.shflags
*.tgz
Makefile.dapper
Dockerfile.*
+3
View File
@@ -1,5 +1,8 @@
{
"ignorePatterns": [
{
"pattern": "^https://docs.github.com"
},
{
"pattern": "^https://github.com/\\S+/\\S+/(issues|pull)/[0-9]+"
},
+1 -1
View File
@@ -1,7 +1,7 @@
---
cni: ovn
submariner: true
nodes: control-plane worker worker
nodes: control-plane
clusters:
cluster1:
cluster2:
+1 -1
View File
@@ -1,7 +1,7 @@
---
cni: weave
submariner: true
nodes: control-plane worker
nodes: control-plane
clusters:
cluster1:
cluster2:
-16
View File
@@ -1,16 +0,0 @@
ARG BASE_BRANCH
FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH}
ARG DAPPER_HOST_ARCH
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
DAPPER_ENV="REPO TAG QUAY_USERNAME QUAY_PASSWORD GITHUB_SHA MAKEFLAGS CLUSTERS_ARGS DEPLOY_ARGS E2E_ARGS RELEASE_ARGS" \
DAPPER_SOURCE=/go/src/github.com/submariner-io/submariner-charts DAPPER_DOCKER_SOCKET=true
ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output PATH=${DAPPER_SOURCE}/bin/:${PATH}
WORKDIR ${DAPPER_SOURCE}
# Override the Helm deployment scripts
COPY deploy_helm /opt/shipyard/scripts/lib/
ENTRYPOINT ["/opt/shipyard/scripts/entry"]
CMD ["sh"]
+5 -16
View File
@@ -1,5 +1,6 @@
BASE_BRANCH ?= devel
export BASE_BRANCH
export HELM_REPO_LOCATION=.
ifneq (,$(DAPPER_HOST_ARCH))
@@ -10,30 +11,18 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
include $(SHIPYARD_DIR)/Makefile.inc
ifneq (,$(filter ovn,$(_using)))
CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
else
CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
endif
override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm
export DEPLOY_ARGS
export DEPLOYTOOL = helm
GH_URL=https://submariner-io.github.io/submariner-charts/charts
CHARTS_DIR=charts
CHARTS_VERSION=0.10.1
CHARTS_VERSION=0.13.0-rc2
HELM_DOCS_VERSION=0.15.0
REPO_URL=$(shell git config remote.origin.url)
# Process extra flags from the `using=a,b,c` optional flag
ifneq (,$(filter lighthouse,$(_using)))
override DEPLOY_ARGS += --service_discovery
endif
ifneq (,$(filter globalnet,$(_using)))
override DEPLOY_ARGS += --globalnet
endif
# Targets to make
e2e: E2E_ARGS=cluster1 cluster2
+1 -1
View File
@@ -60,4 +60,4 @@ working correctly.
[Helm]: https://helm.sh/docs/using_helm/#installing-helm
[Docker]: https://docs.docker.com/install/
[Podman]: https://podman.io/getting-started/installation
[Create a fork]: https://help.github.com/en/articles/fork-a-repo
[Create a fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
-76
View File
@@ -1,76 +0,0 @@
# shellcheck shell=bash
# shellcheck source=scripts/shared/lib/source_only
. "${BASH_SOURCE%/*}"/source_only
### Constants ###
readonly SUBMARINER_BROKER_NS=submariner-k8s-broker
readonly SUBMARINER_PSK=$(LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 64 | head -n 1)
### Functions ###
function deploytool_prereqs() {
helm version
}
function setup_broker() {
if kubectl get crd clusters.submariner.io > /dev/null 2>&1; then
echo "Submariner CRDs already exist, skipping broker creation..."
else
echo "Installing submariner broker..."
# shellcheck disable=SC2086 # Split on purpose
helm install "${SUBMARINER_BROKER_NS}" ./submariner-k8s-broker \
--create-namespace \
--kube-context "${cluster}" \
--namespace "${SUBMARINER_BROKER_NS}" \
${deploytool_broker_args}
fi
submariner_broker_url=$(kubectl -n default get endpoints kubernetes -o jsonpath="{.subsets[0].addresses[0].ip}:{.subsets[0].ports[?(@.name=='https')].port}")
submariner_broker_ca=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='${SUBMARINER_BROKER_NS}-client')].data['ca\.crt']}")
submariner_broker_token=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='${SUBMARINER_BROKER_NS}-client')].data.token}"|base64 --decode)
}
function helm_install_subm() {
local crd_create=false
[[ "${cluster}" = "${broker}" ]] || crd_create=true
if kubectl wait --for=condition=Ready pods -l app=submariner-operator -n "${SUBM_NS}" --timeout=60s > /dev/null 2>&1; then
echo "Submariner already installed, skipping installation..."
return
fi
echo "Installing Submariner..."
# shellcheck disable=SC2086 # Split on purpose
helm --kube-context "${cluster}" install submariner-operator \
./submariner-operator \
--create-namespace \
--namespace "${SUBM_NS}" \
--set ipsec.psk="${SUBMARINER_PSK}" \
--set broker.server="${submariner_broker_url}" \
--set broker.token="${submariner_broker_token}" \
--set broker.namespace="${SUBMARINER_BROKER_NS}" \
--set broker.ca="${submariner_broker_ca}" \
--set broker.globalnet="${globalnet}" \
--set submariner.serviceDiscovery="${service_discovery}" \
--set submariner.cableDriver="${cable_driver}" \
--set submariner.clusterId="${cluster}" \
--set submariner.clusterCidr="${cluster_CIDRs[$cluster]}" \
--set submariner.serviceCidr="${service_CIDRs[$cluster]}" \
--set submariner.globalCidr="${global_CIDRs[$cluster]}" \
--set serviceAccounts.globalnet.create="${globalnet}" \
--set serviceAccounts.lighthouseAgent.create="${service_discovery}" \
--set serviceAccounts.lighthouseCoreDns.create="${service_discovery}" \
--set submariner.natEnabled="false" \
--set operator.image.repository="localhost:5000/submariner-operator" \
--set operator.image.tag="local" \
--set operator.image.pullPolicy="IfNotPresent" \
--set submariner.images.repository="localhost:5000" \
--set submariner.images.tag="local" \
--set brokercrds.create="${crd_create}" \
${deploytool_submariner_args}
}
function install_subm_all_clusters() {
run_subm_clusters helm_install_subm
}
+2 -2
View File
@@ -1,8 +1,8 @@
---
name: submariner-k8s-broker
version: 0.6.0
version: 0.13.0-rc2
apiVersion: v2
appVersion: 0.6.0
appVersion: 0.13.0-rc2
description: Submariner Kubernetes Broker
keywords:
home: https://submariner-io.github.io/
+1 -1
View File
@@ -1,6 +1,6 @@
# submariner-k8s-broker
![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square)
![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
Submariner Kubernetes Broker
+2 -2
View File
@@ -6,5 +6,5 @@ You can retrieve the server URL by running
The broker client token and CA can be retrieved by running
$ SUBMARINER_BROKER_CA=$(kubectl -n {{ .Release.Namespace }} get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='{{ template "submariner-k8s-broker.clientServiceAccountName" . }}')].data['ca\.crt']}")
$ SUBMARINER_BROKER_TOKEN=$(kubectl -n {{ .Release.Namespace }} get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='{{ template "submariner-k8s-broker.clientServiceAccountName" . }}')].data.token}"|base64 --decode)
$ SUBMARINER_BROKER_CA=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
$ SUBMARINER_BROKER_TOKEN=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)
@@ -8,4 +8,12 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner-k8s-broker.chart" . }}
app: {{ template "submariner-k8s-broker.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
+2 -2
View File
@@ -1,8 +1,8 @@
---
name: submariner-operator
version: 0.10.1
version: 0.13.0-rc2
apiVersion: v2
appVersion: 0.10.1
appVersion: 0.13.0-rc2
description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
keywords:
home: https://submariner-io.github.io/
+4 -4
View File
@@ -1,6 +1,6 @@
# submariner-operator
![Version: 0.10.1](https://img.shields.io/badge/Version-0.10.1-informational?style=flat-square) ![AppVersion: 0.10.1](https://img.shields.io/badge/AppVersion-0.10.1-informational?style=flat-square)
![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
Submariner enables direct networking between Pods and Services in different Kubernetes clusters
@@ -27,7 +27,7 @@ Submariner enables direct networking between Pods and Services in different Kube
| broker.server | string | `"example.k8s.apiserver"` | |
| broker.token | string | `"test"` | |
| gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` | |
| gateway.image.tag | string | `"0.10.1"` | |
| gateway.image.tag | string | `"0.13.0-rc2"` | |
| ipsec.debug | bool | `false` | |
| ipsec.forceUDPEncaps | bool | `false` | |
| ipsec.ikePort | int | `500` | |
@@ -39,7 +39,7 @@ Submariner enables direct networking between Pods and Services in different Kube
| operator.affinity | object | `{}` | |
| operator.image.pullPolicy | string | `"IfNotPresent"` | |
| operator.image.repository | string | `"quay.io/submariner/submariner-operator"` | |
| operator.image.tag | string | `"0.10.1"` | |
| operator.image.tag | string | `"0.13.0-rc2"` | |
| operator.resources | object | `{}` | |
| operator.tolerations | list | `[]` | |
| rbac.create | bool | `true` | |
@@ -64,7 +64,7 @@ Submariner enables direct networking between Pods and Services in different Kube
| submariner.globalCidr | string | `""` | |
| submariner.healthcheckEnabled | bool | `true` | |
| submariner.images.repository | string | `"quay.io/submariner"` | |
| submariner.images.tag | string | `"0.10.1"` | |
| submariner.images.tag | string | `"0.13.0-rc2"` | |
| submariner.natEnabled | bool | `false` | |
| submariner.serviceCidr | string | `""` | |
| submariner.serviceDiscovery | bool | `true` | |
+2 -2
View File
@@ -14,7 +14,7 @@ questions:
type: string
label: Submariner Operator Image Repository
- variable: operator.image.tag
default: "0.10.1"
default: "0.13.0-rc2"
description: "Submariner Operator Image Tag"
type: string
label: Submariner Operator Image Tag
@@ -32,7 +32,7 @@ questions:
type: string
label: Submariner Repository
- variable: submariner.images.tag
default: "0.10.1"
default: "0.13.0-rc2"
description: "Submariner Images Tag (shared for all non-operator images)"
type: string
label: Submariner Images Tag
+11
View File
@@ -162,6 +162,17 @@ rules:
- patch
- update
- watch
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- list
- watch
- create
- update
- delete
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
@@ -8,6 +8,14 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner.chart" . }}
app: {{ template "submariner.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner.operatorServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner.operatorServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
---
{{- if .Values.serviceAccounts.gateway.create }}
@@ -20,6 +28,14 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner.chart" . }}
app: {{ template "submariner.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner.gatewayServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner.gatewayServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
---
{{- if .Values.serviceAccounts.routeAgent.create }}
@@ -32,6 +48,14 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner.chart" . }}
app: {{ template "submariner.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner.routeAgentServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner.routeAgentServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
---
{{- if .Values.serviceAccounts.globalnet.create }}
@@ -44,6 +68,14 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner.chart" . }}
app: {{ template "submariner.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner.globalnetServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner.globalnetServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
---
{{- if .Values.serviceAccounts.lighthouseAgent.create }}
@@ -56,6 +88,14 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner.chart" . }}
app: {{ template "submariner.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
---
{{- if .Values.serviceAccounts.lighthouseCoreDns.create }}
@@ -68,4 +108,12 @@ metadata:
release: {{ .Release.Name | quote }}
chart: {{ template "submariner.chart" . }}
app: {{ template "submariner.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}-token
annotations:
kubernetes.io/service-account.name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
+3 -3
View File
@@ -14,7 +14,7 @@ submariner:
coreDNSCustomConfig: {}
images:
repository: quay.io/submariner
tag: "0.10.1"
tag: "0.13.0-rc2"
broker:
server: example.k8s.apiserver
token: test
@@ -37,7 +37,7 @@ leadership:
operator:
image:
repository: quay.io/submariner/submariner-operator
tag: "0.10.1"
tag: "0.13.0-rc2"
pullPolicy: IfNotPresent
resources: {}
tolerations: []
@@ -45,7 +45,7 @@ operator:
gateway:
image:
repository: quay.io/submariner/submariner-gateway
tag: "0.10.1"
tag: "0.13.0-rc2"
serviceAccounts:
operator:
create: true