Keep notes's variables consistent with documents

Signed-off-by: ii2day <ji.li@daocloud.io>

.github/dependabot.yml

@@ -4,14 +4,19 @@ updates:
   - package-ecosystem: github-actions
     directory: '/'
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.12"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.13"
     schedule:
-      interval: weekly
+      interval: monthly
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.14"
+    schedule:
+      interval: monthly

.github/workflows/branch.yml

@@ -11,6 +11,6 @@ jobs:
     name: PR targets branch
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets release-0.14
+      - name: Check that the PR targets devel
-        if: ${{ github.base_ref != 'release-0.14' }}
+        if: ${{ github.base_ref != 'devel' }}
         run: exit 1

.github/workflows/dependent-issues.yml

@@ -30,7 +30,7 @@ jobs:
     if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
-      - uses: z0al/dependent-issues@950226e7ca8fc43dc209a7febf67c655af3bdb43
+      - uses: z0al/dependent-issues@0fae07162bc9e0d8e116a133bd03686eed6efa21
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/e2e-full.yml

@@ -29,11 +29,11 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         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@release-0.14
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/e2e.yml

@@ -16,8 +16,8 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/flake_finder.yml

@@ -24,10 +24,10 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         with:
           using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/linting.yml

@@ -53,6 +53,9 @@ jobs:
       - name: Set up helm/chart-testing
         uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec
 
+      - name: Set up local helm repo
+        run: make local-helm-repo
+
       - name: Run helm/chart-testing (lint)
         run: ct lint --config ct.yaml
 
@@ -85,7 +88,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@3faccbcf285e2c0424212c17908f8adcfbd0c2ad
+        uses: gaurav-nelson/github-action-markdown-link-check@4d97ad89bbb0de4be573a9d7a2fc0ce900afc519
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"

.github/workflows/periodic.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@3faccbcf285e2c0424212c17908f8adcfbd0c2ad
+        uses: gaurav-nelson/github-action-markdown-link-check@4d97ad89bbb0de4be573a9d7a2fc0ce900afc519
         with:
           config-file: ".markdownlinkcheck.json"
 

.github/workflows/release.yml

@@ -4,7 +4,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - release-0.14
+      - devel
 
 permissions:
   contents: write

.gitignore

@@ -4,3 +4,4 @@
 *.tgz
 Makefile.dapper
 Dockerfile.*
+helm_repo

Makefile

@@ -1,6 +1,6 @@
-BASE_BRANCH ?= release-0.14
+BASE_BRANCH ?= devel
 export BASE_BRANCH
-export HELM_REPO_LOCATION=.
+export HELM_REPO_LOCATION=./helm_repo
 
 ifneq (,$(DAPPER_HOST_ARCH))
 
@@ -17,7 +17,7 @@ endif
 export DEPLOYTOOL = helm
 GH_URL=https://submariner-io.github.io/submariner-charts/charts
 CHARTS_DIR=charts
-CHARTS_VERSION=0.14.0-m1
+CHARTS_VERSION=0.14.0
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 SUBCTL_VERSION=$(CHARTS_VERSION)
@@ -25,11 +25,20 @@ export SUBCTL_VERSION
 
 # Targets to make
 
-e2e: E2E_ARGS=cluster1 cluster2
+CHART_PACKAGES := submariner-k8s-broker-$(CHARTS_VERSION).tgz submariner-operator-$(CHARTS_VERSION).tgz
+
+local-helm-repo: $(CHART_PACKAGES)
+	mkdir -p $(HELM_REPO_LOCATION)
+	for archive in $^; do \
+	  tar xzf $$archive -C $(HELM_REPO_LOCATION); \
+	done
+
+e2e: local-helm-repo
+	$(SCRIPTS_DIR)/e2e.sh
 
 %.tgz:
 	helm dep update $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
-	helm package --version $(CHARTS_VERSION) $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
+	helm package --version $(CHARTS_VERSION) --app-version $(CHARTS_VERSION) $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
 
 helm-docs:
 	# Avoid polluting repo with helm-docs' README/LICENSE or other files in the release archive
@@ -45,7 +54,7 @@ helm-docs:
 		exit 1; \
 	fi
 
-release: submariner-k8s-broker-$(CHARTS_VERSION).tgz submariner-operator-$(CHARTS_VERSION).tgz
+release: $(CHART_PACKAGES)
 	git checkout gh-pages
 	mv *.tgz $(CHARTS_DIR)
 	if [ -f $(CHARTS_DIR)/index.yaml ]; then \

ct.yaml

@@ -1,7 +1,7 @@
 ---
 charts:
-  - submariner-operator
+  - ./helm_repo/submariner-operator
-  - submariner-k8s-broker
+  - ./helm_repo/submariner-k8s-broker
 # Tests that maintainer name is valid GitHub account, which isn't what we want
 # See: https://github.com/helm/chart-testing/issues/192
 validate-maintainers: false

submariner-k8s-broker/Chart.yaml

@@ -1,8 +1,7 @@
 ---
 name: submariner-k8s-broker
-version: 0.14.0-m1
+version: 0.0.0
 apiVersion: v2
-appVersion: 0.14.0-m1
 description: Submariner Kubernetes Broker
 keywords:
 home: https://submariner-io.github.io/

submariner-k8s-broker/templates/NOTES.txt

@@ -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 "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
+  $ SUBMARINER_BROKER_CA=$(kubectl -n "${BROKER_NS}" get secrets "${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)
+  $ SUBMARINER_BROKER_TOKEN=$(kubectl -n "${BROKER_NS}" get secrets "${BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)

submariner-operator/Chart.yaml

@@ -1,8 +1,7 @@
 ---
 name: submariner-operator
-version: 0.14.0-m1
+version: 0.0.0
 apiVersion: v2
-appVersion: 0.14.0-m1
 description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
 home: https://submariner-io.github.io/

submariner-operator/README.md

@@ -24,8 +24,6 @@ Submariner enables direct networking between Pods and Services in different Kube
 | broker.namespace | string | `"xyz"` |  |
 | broker.server | string | `"example.k8s.apiserver"` |  |
 | broker.token | string | `"test"` |  |
-| gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` |  |
-| gateway.image.tag | string | `"0.14.0"` |  |
 | ipsec.debug | bool | `false` |  |
 | ipsec.forceUDPEncaps | bool | `false` |  |
 | ipsec.ikePort | int | `500` |  |

submariner-operator/templates/NOTES.txt

@@ -1,7 +1,3 @@
 Submariner is now installed.
 
-{{- if .Values.gateway.nodeSelectorEnabled }}
+By default, Submariner runs with 1 replica. If you have more than one Gateway host, you can scale Submariner to N replicas, and the other Submariner pods will simply join the leader election pool.
-If you haven't done so yet, please label a node as `submariner.io/gateway=true` to elect it for running Submariner.
-{{- end }}
-
-By default, Submariner runs with 1 replica. If you have more than one Gateway host, you can scale Submariner to N replicas, and the other Submariner pods will simply join the leader election pool.

submariner-operator/templates/submariner.yaml

@@ -23,7 +23,7 @@ spec:
   namespace: {{ .Release.Namespace }}
   natEnabled: {{ .Values.submariner.natEnabled }}
   repository: {{ .Values.submariner.images.repository }}
-  version: {{ .Values.submariner.images.tag }}
+  version: {{ default .Chart.AppVersion .Values.submariner.images.tag }}
 {{- with .Values.images }}
 {{- if . }}
   imageOverrides:

submariner-operator/values.yaml

@@ -15,7 +15,7 @@ submariner:
   coreDNSCustomConfig: {}
   images:
     repository: quay.io/submariner
-    tag: "0.14.0-m1"
+    tag: ""
 broker:
   server: example.k8s.apiserver
   token: test
@@ -39,15 +39,11 @@ leadership:
 operator:
   image:
     repository: quay.io/submariner/submariner-operator
-    tag: "0.14.0-m1"
+    tag: ""
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
   affinity: {}
-gateway:
-  image:
-    repository: quay.io/submariner/submariner-gateway
-    tag: "0.14.0-m1"
 serviceAccounts:
   operator:
     create: true