Update Submariner dependencies to v0.22.0-m2

Signed-off-by: Automated Release <release@submariner.io>

.github/dependabot.yml

@@ -45,3 +45,12 @@ updates:
       github-actions:
         patterns:
           - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.21"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/e2e-full.yml

@@ -19,14 +19,14 @@ jobs:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
         # Run most tests against the latest K8s version
-        k8s_version: ['1.32']
+        k8s_version: ['k8s-latest']
         lighthouse: ['', 'lighthouse']
         include:
           # Bottom of supported K8s version range
-          - k8s_version: '1.29'
+          - k8s_version: 'k8s-oldest-supported'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run E2E deployment and tests
         uses: submariner-io/shipyard/gh-actions/e2e@devel

.github/workflows/e2e.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run E2E deployment and tests
         uses: submariner-io/shipyard/gh-actions/e2e@devel

.github/workflows/flake_finder.yml

@@ -21,7 +21,7 @@ jobs:
         lighthouse: ['', 'lighthouse']
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run E2E deployment and tests
         uses: submariner-io/shipyard/gh-actions/e2e@devel

.github/workflows/linting.yml

@@ -38,10 +38,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up Helm
-        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112
+        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
         with:
           version: v3.6.0
 
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           fetch-depth: 0
       - name: Run gitlint
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run markdown-link-check
         uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Run markdownlint
         run: make markdownlint
 
@@ -108,6 +108,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Run yamllint
         run: make yamllint

.github/workflows/periodic.yml

@@ -16,7 +16,7 @@ jobs:
       issues: write
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run markdown-link-check
         uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           fetch-depth: 0
 

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@f78de9780efb7a789cf4745957fa3374cbb94fd5
+      - uses: actions/stale@8f717f0dfca33b78d3c933452e42558e4456c8e7
         with:
           days-before-issue-stale: 120
           days-before-pr-stale: 14

.gitignore

@@ -6,7 +6,9 @@ Makefile.dapper
 Makefile.shipyard
 Dockerfile.*
 helm_repo
-yamls
+yamls/go.mod
+yamls/go.sum
+yamls/vendor
 submariner-k8s-broker/crds/crd.yaml
 submariner-k8s-broker/templates/_role.tpl
 submariner-operator/crds/crd.yaml

Makefile

@@ -17,7 +17,7 @@ endif
 export DEPLOYTOOL = helm
 GH_URL=https://submariner-io.github.io/submariner-charts/charts
 CHARTS_DIR=charts
-CHARTS_VERSION=0.21.0-m3
+CHARTS_VERSION=0.22.0-m2
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 

extract-yamls

@@ -1,21 +0,0 @@
-#!/usr/bin/awk -f
-
-# Start of a file entry
-/= `/ {
-    outfile = gensub("_yaml$", ".yaml", "1", $1)
-    print "Writing " outfile
-    firstline = substr($0, index($0, "`") + 1)
-    if (firstline !~ "^---")
-        firstline = "---\n"firstline
-    print firstline > outfile
-    next
-}
-
-/^`$/ {
-    outfile = ""
-    next
-}
-
-outfile != "" {
-    print >> outfile
-}

generate-yamls.sh

@@ -10,81 +10,94 @@ GLOBALNET_RBAC_YAML=submariner-operator/templates/globalnet-rbac.yaml
 SERVICE_DISC_RBAC_YAML=submariner-operator/templates/service-discovery-rbac.yaml
 OPENSHIFT_MONITORING_YAML=submariner-operator/templates/openshift-monitoring-rbac.yaml
 
+YAMLS_BASE=yamls/vendor
+SUBM_CRDS=${YAMLS_BASE}/github.com/submariner-io/submariner/deploy/crds
+OPERATOR_CRDS=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/deploy/crds
+MCS_CRDS=${YAMLS_BASE}/sigs.k8s.io/mcs-api/config/crd
+BROKER=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/broker/broker-client
+RBAC_BASE=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/rbac
+OPENSHIFT=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/openshift
+
 function add_service_acct_ns() {
     sed -i '/- kind: ServiceAccount/a \ \ \ \ namespace: {{ .Release.Namespace }}' $1
 }
 
-mkdir -p yamls
 cd yamls
-curl -L https://raw.githubusercontent.com/submariner-io/submariner-operator/refs/heads/$1/pkg/embeddedyamls/yamls.go | ../extract-yamls
+rm go.mod || true
-cd -
+go mod init
+go get github.com/submariner-io/submariner-operator@$1
+go mod tidy
+go mod vendor
+cd ..
 
 # Generate the CRDs for the broker chart
 mkdir -p submariner-k8s-broker/crds
-cat yamls/Deploy_submariner_crds_submariner_io_endpoints.yaml \
+cat ${SUBM_CRDS}/submariner.io_endpoints.yaml \
-	  yamls/Deploy_submariner_crds_submariner_io_clusters.yaml \
+	  ${SUBM_CRDS}/submariner.io_clusters.yaml \
-		yamls/Deploy_submariner_crds_submariner_io_gateways.yaml \
+		${SUBM_CRDS}/submariner.io_gateways.yaml > submariner-k8s-broker/crds/crd.yaml
-		yamls/Deploy_mcsapi_crds_multicluster_x_k8s_io_serviceexports.yaml \
+echo '---' >> submariner-k8s-broker/crds/crd.yaml
-		yamls/Deploy_mcsapi_crds_multicluster_x_k8s_io_serviceimports.yaml > submariner-k8s-broker/crds/crd.yaml
+cat ${MCS_CRDS}/multicluster.x-k8s.io_serviceexports.yaml >> submariner-k8s-broker/crds/crd.yaml
+echo '---' >> submariner-k8s-broker/crds/crd.yaml
+cat ${MCS_CRDS}/multicluster.x-k8s.io_serviceimports.yaml >> submariner-k8s-broker/crds/crd.yaml
 
 # Generate the client role yaml for the broker chart
 echo '{{- define "broker-role" -}}' > ${BROKER_ROLE_TPL}
-cat yamls/Config_broker_broker_client_role.yaml >> ${BROKER_ROLE_TPL}
+cat ${BROKER}/role.yaml >> ${BROKER_ROLE_TPL}
 echo '{{- end -}}' >> ${BROKER_ROLE_TPL}
 sed -i -e 's/name:.*/name: {{ template "submariner-k8s-broker.fullname" \. }}-cluster/' ${BROKER_ROLE_TPL}
 
 # Generate the CRDs for the operator chart
 mkdir -p submariner-operator/crds
-cat yamls/Deploy_crds_submariner_io_submariners.yaml \
+cat ${OPERATOR_CRDS}/submariner.io_submariners.yaml \
-    yamls/Deploy_crds_submariner_io_servicediscoveries.yaml \
+    ${OPERATOR_CRDS}/submariner.io_servicediscoveries.yaml \
-    yamls/Deploy_crds_submariner_io_brokers.yaml > submariner-operator/crds/crd.yaml
+    ${OPERATOR_CRDS}/submariner.io_brokers.yaml > submariner-operator/crds/crd.yaml
 
 # Generate the operator RBAC yaml for the operator chart
-add_service_acct_ns yamls/Config_rbac_submariner_operator_cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/submariner-operator/cluster_role_binding.yaml
-cat yamls/Config_rbac_submariner_operator_service_account.yaml \
+cat ${RBAC_BASE}/submariner-operator/service_account.yaml \
-    yamls/Config_rbac_submariner_operator_role.yaml \
+    ${RBAC_BASE}/submariner-operator/role.yaml \
-    yamls/Config_rbac_submariner_operator_role_binding.yaml \
+    ${RBAC_BASE}/submariner-operator/role_binding.yaml \
-    yamls/Config_rbac_submariner_operator_cluster_role.yaml \
+    ${RBAC_BASE}/submariner-operator/cluster_role.yaml \
-    yamls/Config_rbac_submariner_operator_cluster_role_binding.yaml > ${OPERATOR_RBAC_YAML}
+    ${RBAC_BASE}/submariner-operator/cluster_role_binding.yaml > ${OPERATOR_RBAC_YAML}
 
 # Generate the gateway RBAC yaml for the operator chart
-add_service_acct_ns yamls/Config_rbac_submariner_gateway_cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/submariner-gateway/cluster_role_binding.yaml
-cat yamls/Config_rbac_submariner_gateway_service_account.yaml \
+cat ${RBAC_BASE}/submariner-gateway/service_account.yaml \
-    yamls/Config_rbac_submariner_gateway_role.yaml \
+    ${RBAC_BASE}/submariner-gateway/role.yaml \
-    yamls/Config_rbac_submariner_gateway_role_binding.yaml \
+    ${RBAC_BASE}/submariner-gateway/role_binding.yaml \
-    yamls/Config_rbac_submariner_gateway_cluster_role.yaml \
+    ${RBAC_BASE}/submariner-gateway/cluster_role.yaml \
-    yamls/Config_rbac_submariner_gateway_cluster_role_binding.yaml > ${GATEWAY_RBAC_YAML}
+    ${RBAC_BASE}/submariner-gateway/cluster_role_binding.yaml > ${GATEWAY_RBAC_YAML}
 
 # Generate the routeagent RBAC yaml for the operator chart
-add_service_acct_ns yamls/Config_rbac_submariner_route_agent_cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/submariner-route-agent/cluster_role_binding.yaml
-cat yamls/Config_rbac_submariner_route_agent_service_account.yaml \
+cat ${RBAC_BASE}/submariner-route-agent/service_account.yaml \
-    yamls/Config_rbac_submariner_route_agent_role.yaml \
+    ${RBAC_BASE}/submariner-route-agent/role.yaml \
-    yamls/Config_rbac_submariner_route_agent_role_binding.yaml \
+    ${RBAC_BASE}/submariner-route-agent/role_binding.yaml \
-    yamls/Config_rbac_submariner_route_agent_cluster_role.yaml \
+    ${RBAC_BASE}/submariner-route-agent/cluster_role.yaml \
-    yamls/Config_rbac_submariner_route_agent_cluster_role_binding.yaml > ${ROUTE_AGENT_RBAC_YAML}
+    ${RBAC_BASE}/submariner-route-agent/cluster_role_binding.yaml > ${ROUTE_AGENT_RBAC_YAML}
 
 # Generate the globalnet RBAC yaml for the operator chart
 echo '{{- if .Values.broker.globalnet }}' > ${GLOBALNET_RBAC_YAML}
-add_service_acct_ns yamls/Config_rbac_submariner_globalnet_cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/submariner-globalnet/cluster_role_binding.yaml
-cat yamls/Config_rbac_submariner_globalnet_service_account.yaml \
+cat ${RBAC_BASE}/submariner-globalnet/service_account.yaml \
-    yamls/Config_rbac_submariner_globalnet_role.yaml \
+    ${RBAC_BASE}/submariner-globalnet/role.yaml \
-    yamls/Config_rbac_submariner_globalnet_role_binding.yaml \
+    ${RBAC_BASE}/submariner-globalnet/role_binding.yaml \
-    yamls/Config_rbac_submariner_globalnet_cluster_role.yaml \
+    ${RBAC_BASE}/submariner-globalnet/cluster_role.yaml \
-    yamls/Config_rbac_submariner_globalnet_cluster_role_binding.yaml >> ${GLOBALNET_RBAC_YAML}
+    ${RBAC_BASE}/submariner-globalnet/cluster_role_binding.yaml >> ${GLOBALNET_RBAC_YAML}
 echo '{{- end -}}' >> ${GLOBALNET_RBAC_YAML}
 
 # Generate the service discovery RBAC yaml for the operator chart
 echo '{{- if .Values.submariner.serviceDiscovery }}' > ${SERVICE_DISC_RBAC_YAML}
-add_service_acct_ns yamls/Config_rbac_lighthouse_agent_cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml
-add_service_acct_ns yamls/Config_rbac_lighthouse_coredns_cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml
-cat yamls/Config_rbac_lighthouse_agent_service_account.yaml \
+cat ${RBAC_BASE}/lighthouse-agent/service_account.yaml \
-    yamls/Config_rbac_lighthouse_agent_cluster_role.yaml \
+    ${RBAC_BASE}/lighthouse-agent/cluster_role.yaml \
-    yamls/Config_rbac_lighthouse_agent_cluster_role_binding.yaml \
+    ${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml \
-    yamls/Config_rbac_lighthouse_coredns_service_account.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/service_account.yaml \
-    yamls/Config_rbac_lighthouse_coredns_cluster_role.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/cluster_role.yaml \
-    yamls/Config_rbac_lighthouse_coredns_cluster_role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
+    ${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
 echo '{{- end -}}' >> ${SERVICE_DISC_RBAC_YAML}
 
 # Generate the openshift monitoring rbac yaml for the operator chart
-cat yamls/Config_openshift_rbac_submariner_metrics_reader_role.yaml \
+cat ${OPENSHIFT}/rbac/submariner-metrics-reader/role.yaml \
-    yamls/Config_openshift_rbac_submariner_metrics_reader_role_binding.yaml > ${OPENSHIFT_MONITORING_YAML}
+    ${OPENSHIFT}/rbac/submariner-metrics-reader/role_binding.yaml > ${OPENSHIFT_MONITORING_YAML}

yamls/generate-yamls.go

@@ -0,0 +1,38 @@
+//go:build yamls
+
+/*
+SPDX-License-Identifier: Apache-2.0
+
+Copyright Contributors to the Submariner project.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Place any runtime dependencies as imports in this file.
+// Go modules will be forced to download and install them.
+
+package yamls
+
+import (
+	_ "github.com/submariner-io/submariner-operator/config/broker/broker-client"
+	_ "github.com/submariner-io/submariner-operator/config/openshift/rbac/submariner-metrics-reader"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-gateway"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-globalnet"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-operator"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-route-agent"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-agent"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-coredns"
+	_ "github.com/submariner-io/submariner-operator/deploy/crds"
+	_ "github.com/submariner-io/submariner/deploy/crds"
+	_ "sigs.k8s.io/mcs-api/config/crd"
+)