Skip to content

Commit 56e90e7

Browse files
committed
Cleanup old consts and tests
1 parent 0af35ab commit 56e90e7

File tree

26 files changed

+25
-498
lines changed

26 files changed

+25
-498
lines changed

deployments/liqo/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
| networking.gatewayTemplates.server.service.annotations | object | `{"service.beta.kubernetes.io/aws-load-balancer-type":"nlb"}` | Annotations for the server service. |
146146
| networking.iptables | object | `{"mode":"nf_tables"}` | Iptables configuration tuning. |
147147
| networking.iptables.mode | string | `"nf_tables"` | Select the iptables mode to use. Possible values are "legacy" and "nf_tables". |
148-
| networking.legacy | bool | `false` | Set to "true" to install the legacy networking stack. |
149148
| networking.mtu | int | `1340` | Set the MTU for the interfaces managed by liqo: vxlan, tunnel and veth interfaces. The value is used by the gateway and route operators. The default value is configured to ensure correct behavior regardless of the combination of the underlying environments (e.g., cloud providers). This guarantees improved compatibility at the cost of possible limited performance drops. |
150149
| networking.reflectIPs | bool | `true` | Reflect pod IPs and EnpointSlices to the remote clusters. |
151150
| networking.securityMode | string | `"FullPodToPod"` | Select the mode to enforce security on connectivity among clusters. Possible values are "FullPodToPod" and "IntraClusterTrafficSegregation" |

deployments/liqo/templates/_helpers.tpl

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,6 @@ Create the file name of a cluster role starting from a prefix, it accepts a dict
130130
{{- printf "files/%s-%s" .prefix "ClusterRole.yaml" }}
131131
{{- end }}
132132

133-
{{/*
134-
Gateway pod labels.
135-
If you change any value here, please make sure that you change it also in the source code.
136-
*/}}
137-
{{- define "liqo.gatewayPodLabels" -}}
138-
net.liqo.io/gateway: "standby"
139-
{{- end }}
140-
141-
{{/*
142-
Label selector used by the gateway service to select the right gateway pod.
143-
If you change any value here, please make sure that you change it also in the source code.
144-
*/}}
145-
{{- define "liqo.gatewaySelector" -}}
146-
net.liqo.io/gateway: "active"
147-
{{- end }}
148-
149133
{{/*
150134
Auth pod labels
151135
*/}}
@@ -167,13 +151,6 @@ Webhook pod labels
167151
webhook.liqo.io/backend: "liqo-webhook"
168152
{{- end }}
169153

170-
{{/*
171-
Gateway service labels
172-
*/}}
173-
{{- define "liqo.gatewayServiceLabels" -}}
174-
net.liqo.io/gateway: "true"
175-
{{- end }}
176-
177154
{{/*
178155
Pre-delete hook Annotations
179156
*/}}

deployments/liqo/templates/liqo-controller-manager-deployment.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{{- $ctrlManagerConfig := (merge (dict "name" "controller-manager" "module" "controller-manager" "version" .Values.controllerManager.image.version) .) -}}
33
{{- $kubeletConfig := (merge (dict "name" "virtual-kubelet" "module" "virtualkubelet" "version" .Values.virtualKubelet.image.version) .) -}}
44
{{- $webhookConfig := (merge (dict "name" "webhook" "module" "webhook") .) -}}
5-
{{- $netManagerConfig := (merge (dict "name" "network-manager" "module" "networking") .) -}}
65
{{- $ipamConfig := (merge (dict "name" "ipam" "module" "ipam") .) -}}
76

87
{{- $vkargs := .Values.virtualKubelet.extra.args }}
@@ -123,8 +122,6 @@ spec:
123122
{{- else if not .Values.networking.enabled }}
124123
- --ipam-server=
125124
- --networking-enabled=false
126-
{{- else if .Values.networking.legacy }}
127-
- --ipam-server={{ include "liqo.prefixedName" $netManagerConfig }}.{{ .Release.Namespace }}:6000
128125
{{- else }}
129126
- --ipam-server={{ include "liqo.prefixedName" $ipamConfig }}.{{ .Release.Namespace }}:6000
130127
{{- end }}

deployments/liqo/templates/liqo-ipam-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (.Values.networking.enabled) (not .Values.ipam.external.enabled) (not .Values.networking.legacy ) }}
1+
{{- if and (.Values.networking.enabled) (not .Values.ipam.external.enabled) }}
22

33
{{- $ipamConfig := (merge (dict "name" "ipam" "module" "ipam" "version" .Values.ipam.internal.image.version) .) -}}
44
{{- $ha := (gt .Values.ipam.internal.replicas 1.0) -}}

deployments/liqo/templates/liqo-ipam-rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
{{- $ipamConfig := (merge (dict "name" "ipam" "module" "ipam") .) -}}
33

4-
{{- if and (.Values.networking.enabled) (not .Values.ipam.external.enabled) (not .Values.networking.legacy ) }}
4+
{{- if and (.Values.networking.enabled) (not .Values.ipam.external.enabled) }}
55

66
apiVersion: v1
77
kind: ServiceAccount

deployments/liqo/templates/liqo-ipam-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (.Values.networking.enabled) (not .Values.ipam.external.enabled) (not .Values.networking.legacy ) }}
1+
{{- if and (.Values.networking.enabled) (not .Values.ipam.external.enabled) }}
22

33
{{- $ipamConfig := (merge (dict "name" "ipam" "module" "ipam") .) -}}
44
{{- $ha := (gt .Values.ipam.internal.replicas 1.0) -}}

deployments/liqo/values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ apiServer:
2424
trustedCA: false
2525

2626
networking:
27-
# -- Set to "true" to install the legacy networking stack.
28-
legacy: false
2927
# -- Use the default Liqo networking module.
3028
enabled: true
3129
# -- Reflect pod IPs and EnpointSlices to the remote clusters.

docs/faq/faq.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ It is highly recommended to first unpeer all existing foreignclusters before upg
7979
If using `liqoctl unpeer` command does not fix the problem (probably due to some cluster setup misconfiguration), you can try to manually unpeer the cluster by force deleting all Liqo resources associated with that ForeignCluster.
8080
To do this, force delete all resources (look also in the tenant namespace) with the following types (possibly in this order):
8181

82-
* `TunnelEndpoint`
83-
* `NetworkConfig`
8482
* `ResourceOffers`
8583
* `ResourceRequests`
8684
* `NamespaceMap`

internal/crdReplicator/crdReplicator_operator_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ var _ = Describe("CRD Replicator Operator Tests", func() {
3838
foreignClusterName = "foreign-cluster"
3939
resourceRequestName = "resource-request"
4040
resourceOfferName = "resource-offer"
41-
networkConfigName = "network-config"
4241

4342
authURL = "https://foo.bar"
4443
)

internal/crdReplicator/reflection/manager_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ var _ = Describe("Manager tests", func() {
127127

128128
AfterEach(func() { cancel() })
129129

130-
CreateNetworkConfig := func() error {
130+
CreateReplicatedResource := func() error {
131131
obj := &unstructured.Unstructured{}
132132
obj.SetGroupVersionKind(objGVK)
133133
obj.SetNamespace(objNamespace)
@@ -144,14 +144,14 @@ var _ = Describe("Manager tests", func() {
144144
return func() {
145145
JustBeforeEach(func() {
146146
if alreadyPresent && !skipCreation {
147-
Expect(CreateNetworkConfig()).To(Succeed())
147+
Expect(CreateReplicatedResource()).To(Succeed())
148148
}
149149

150150
manager.Start(ctx, res)
151151
manager.registerHandler(gvr, localNamespace, func(key item) { receiver <- key })
152152

153153
if !alreadyPresent && !skipCreation {
154-
Expect(CreateNetworkConfig()).To(Succeed())
154+
Expect(CreateReplicatedResource()).To(Succeed())
155155
}
156156
})
157157

@@ -166,7 +166,7 @@ var _ = Describe("Manager tests", func() {
166166
JustBeforeEach(func() {
167167
manager.unregisterHandler(gvr, localNamespace)
168168
// Create the object only once the handler has been unregistered, to prevent race conditions.
169-
Expect(CreateNetworkConfig()).To(Succeed())
169+
Expect(CreateReplicatedResource()).To(Succeed())
170170
})
171171
It("should not trigger the handler", func() { Consistently(receiver).ShouldNot(Receive()) })
172172
})

0 commit comments

Comments
 (0)