External-network: legacy gateway

liqotech · Oct 18, 2023 · dee6d96 · dee6d96
1 parent 11ebf16
commit dee6d96
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 55 deletions.
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ manifests: controller-gen
 rbacs: controller-gen
 	rm -f deployments/liqo/files/*
 	$(CONTROLLER_GEN) paths="./internal/liqonet/route-operator" rbac:roleName=liqo-route output:rbac:stdout | awk -v RS="---\n" 'NR>1{f="./deployments/liqo/files/liqo-route-" $$4 ".yaml";printf "%s",$$0 > f; close(f)}' && $(SED_COMMAND) deployments/liqo/files/liqo-route-ClusterRole.yaml deployments/liqo/files/liqo-route-Role.yaml
-	$(CONTROLLER_GEN) paths="./internal/liqonet/tunnel-operator" rbac:roleName=liqo-gateway output:rbac:stdout | awk -v RS="---\n" 'NR>1{f="./deployments/liqo/files/liqo-gateway-" $$4 ".yaml";printf "%s",$$0 > f; close(f)}' && $(SED_COMMAND) deployments/liqo/files/liqo-gateway-ClusterRole.yaml deployments/liqo/files/liqo-gateway-Role.yaml
+	$(CONTROLLER_GEN) paths="./internal/liqonet/tunnel-operator" rbac:roleName=liqo-legacy-gateway output:rbac:stdout | awk -v RS="---\n" 'NR>1{f="./deployments/liqo/files/liqo-legacy-gateway-" $$4 ".yaml";printf "%s",$$0 > f; close(f)}' && $(SED_COMMAND) deployments/liqo/files/liqo-legacy-gateway-ClusterRole.yaml deployments/liqo/files/liqo-legacy-gateway-Role.yaml
 	$(CONTROLLER_GEN) paths="./internal/liqonet/network-manager/..." rbac:roleName=liqo-network-manager output:rbac:stdout | awk -v RS="---\n" 'NR>1{f="./deployments/liqo/files/liqo-network-manager-" $$4 ".yaml";printf "%s",$$0 > f; close(f)}' && $(SED_COMMAND) deployments/liqo/files/liqo-network-manager-ClusterRole.yaml deployments/liqo/files/liqo-network-manager-Role.yaml
 	$(CONTROLLER_GEN) paths="./internal/crdReplicator" rbac:roleName=liqo-crd-replicator output:rbac:stdout | awk -v RS="---\n" 'NR>1{f="./deployments/liqo/files/liqo-crd-replicator-" $$4 ".yaml";printf "%s",$$0 > f; close(f)}' && $(SED_COMMAND) deployments/liqo/files/liqo-crd-replicator-ClusterRole.yaml deployments/liqo/files/liqo-crd-replicator-Role.yaml
 	$(CONTROLLER_GEN) paths="./pkg/discoverymanager" rbac:roleName=liqo-discovery output:rbac:stdout | awk -v RS="---\n" 'NR>1{f="./deployments/liqo/files/liqo-discovery-" $$4 ".yaml";printf "%s",$$0 > f; close(f)}' && $(SED_COMMAND) deployments/liqo/files/liqo-discovery-ClusterRole.yaml deployments/liqo/files/liqo-discovery-Role.yaml

diff --git a/deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_publickeys.yaml b/deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_publickeys.yaml
diff --git a/.../liqo/files/liqo-gateway-ClusterRole.yaml → ...iles/liqo-legacy-gateway-ClusterRole.yaml b/.../liqo/files/liqo-gateway-ClusterRole.yaml → ...iles/liqo-legacy-gateway-ClusterRole.yaml
diff --git a/...oyments/liqo/files/liqo-gateway-Role.yaml → .../liqo/files/liqo-legacy-gateway-Role.yaml b/...oyments/liqo/files/liqo-gateway-Role.yaml → .../liqo/files/liqo-legacy-gateway-Role.yaml
diff --git a/...qo/templates/liqo-gateway-deployment.yaml → ...lates/liqo-legacy-gateway-deployment.yaml b/...qo/templates/liqo-gateway-deployment.yaml → ...lates/liqo-legacy-gateway-deployment.yaml
@@ -1,5 +1,5 @@
 ---
-{{- $gatewayConfig := (merge (dict "name" "gateway" "module" "networking") .) -}}
+{{- $gatewayConfig := (merge (dict "name" "legacy-gateway" "module" "networking") .) -}}
 
 {{- if .Values.networking.internal }}
 

diff --git a/...nts/liqo/templates/liqo-gateway-rbac.yaml → ...o/templates/liqo-legacy-gateway-rbac.yaml b/...nts/liqo/templates/liqo-gateway-rbac.yaml → ...o/templates/liqo-legacy-gateway-rbac.yaml
@@ -1,5 +1,5 @@
 ---
-{{- $gatewayConfig := (merge (dict "name" "gateway" "module" "networking") .) -}}
+{{- $gatewayConfig := (merge (dict "name" "legacy-gateway" "module" "networking") .) -}}
 
 {{- if .Values.networking.internal }}
 

diff --git a/.../liqo/templates/liqo-gateway-service.yaml → ...emplates/liqo-legacy-gateway-service.yaml b/.../liqo/templates/liqo-gateway-service.yaml → ...emplates/liqo-legacy-gateway-service.yaml
@@ -1,5 +1,5 @@
 ---
-{{- $gatewayConfig := (merge (dict "name" "gateway" "module" "networking") .) -}}
+{{- $gatewayConfig := (merge (dict "name" "legacy-gateway" "module" "networking") .) -}}
 
 {{- if .Values.networking.internal }}
 

diff --git a/...emplates/liqo-gateway-servicemonitor.yaml → ...s/liqo-legacy-gateway-servicemonitor.yaml b/...emplates/liqo-gateway-servicemonitor.yaml → ...s/liqo-legacy-gateway-servicemonitor.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.networking.internal }}
 
 ---
-{{- $gatewayMetricsConfig := (merge (dict "name" "gateway-metrics" "module" "networking") .) -}}
+{{- $gatewayMetricsConfig := (merge (dict "name" "legacy-gateway-metrics" "module" "networking") .) -}}
 {{- if .Values.gateway.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

diff --git a/internal/liqonet/tunnel-operator/labelerOperator_test.go b/internal/liqonet/tunnel-operator/labelerOperator_test.go
@@ -78,7 +78,7 @@ var _ = Describe("LabelerOperator", func() {
 				Name:      labelerSvcName,
 				Namespace: labelerReq.Namespace,
 				Labels: map[string]string{
-					consts.K8sAppNameKey:      "gateway",
+					consts.K8sAppNameKey:      "legacy-gateway",
 					consts.K8sAppComponentKey: "networking",
 				},
 			},

diff --git a/pkg/liqoctl/status/local/pods.go b/pkg/liqoctl/status/local/pods.go
@@ -44,7 +44,7 @@ var (
 	}
 	liqoDeploymentsNetwork = []string{
 		"liqo-network-manager",
-		"liqo-gateway",
+		"liqo-legacy-gateway",
 	}
 	liqoDaemonSetsNetwork = []string{
 		"liqo-route",

diff --git a/pkg/utils/labels/labelSelectors.go b/pkg/utils/labels/labelSelectors.go
@@ -182,7 +182,7 @@ func DiscoveryLabelSelector() labels.Selector {
 
 // GatewayLabelSelector returns the label selector associated with the gateway components.
 func GatewayLabelSelector() labels.Selector {
-	return ComponentLabelSelector("gateway", "networking")
+	return ComponentLabelSelector("legacy-gateway", "networking")
 }
 
 // RouteLabelSelector returns the label selector associated with the route components.