(feat): API side support QandQ Vlan configuration

Introduce new API field InnerVlan storing the inner vlan of a QandQ Tag.

Author: sven-rosenzweig

api/core/v1alpha1/interface_types.go

@@ -148,6 +148,12 @@ type Switchport struct {
 	// +kubebuilder:validation:Maximum=4094
 	AccessVlan int32 `json:"accessVlan,omitempty"`
 
+	// InnerVlan specifies the VLAN id for QinQ access mode switchports.
+	// +optional
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=4094
+	InnerVlan int32 `json:"innerVlan,omitempty"`
+
 	// NativeVlan specifies the native VLAN ID for trunk mode switchports.
 	// Only applicable when Mode is set to "Trunk".
 	// +optional

charts/network-operator/templates/cert-manager/metrics-certs.yaml

@@ -2,19 +2,19 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  labels:
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/name: {{ include "network-operator.name" . }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-  name: {{ include "network-operator.resourceName" (dict "suffix" "metrics-certs" "context" $) }}
-  namespace: {{ .Release.Namespace }}
+    labels:
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/name: {{ include "network-operator.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    name: {{ include "network-operator.resourceName" (dict "suffix" "metrics-certs" "context" $) }}
+    namespace: {{ .Release.Namespace }}
 spec:
-  dnsNames:
-  - {{ include "network-operator.resourceName" (dict "suffix" "controller-manager-metrics-service" "context" $) }}.{{ include "network-operator.namespaceName" $ }}.svc
-  - {{ include "network-operator.resourceName" (dict "suffix" "controller-manager-metrics-service" "context" $) }}.{{ include "network-operator.namespaceName" $ }}.svc.cluster.local
-  issuerRef:
-    kind: Issuer
-    name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
-  secretName: metrics-server-cert
+    dnsNames:
+        - {{ include "network-operator.resourceName" (dict "suffix" "controller-manager-metrics-service" "context" $) }}.{{ include "network-operator.namespaceName" $ }}.svc
+        - {{ include "network-operator.resourceName" (dict "suffix" "controller-manager-metrics-service" "context" $) }}.{{ include "network-operator.namespaceName" $ }}.svc.cluster.local
+    issuerRef:
+        kind: Issuer
+        name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
+    secretName: metrics-server-cert
 {{- end }}

charts/network-operator/templates/cert-manager/selfsigned-issuer.yaml

@@ -2,13 +2,13 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  labels:
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/name: {{ include "network-operator.name" . }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-  name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
-  namespace: {{ .Release.Namespace }}
+    labels:
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/name: {{ include "network-operator.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
+    namespace: {{ .Release.Namespace }}
 spec:
-  selfSigned: {}
+    selfSigned: {}
 {{- end }}

charts/network-operator/templates/cert-manager/serving-cert.yaml

@@ -2,19 +2,19 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  labels:
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/name: {{ include "network-operator.name" . }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-  name: {{ include "network-operator.resourceName" (dict "suffix" "serving-cert" "context" $) }}
-  namespace: {{ .Release.Namespace }}
+    labels:
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/name: {{ include "network-operator.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    name: {{ include "network-operator.resourceName" (dict "suffix" "serving-cert" "context" $) }}
+    namespace: {{ .Release.Namespace }}
 spec:
-  dnsNames:
-  - {{ include "network-operator.resourceName" (dict "suffix" "webhook-service" "context" $) }}.{{ .Release.Namespace }}.svc
-  - {{ include "network-operator.resourceName" (dict "suffix" "webhook-service" "context" $) }}.{{ .Release.Namespace }}.svc.cluster.local
-  issuerRef:
-    kind: Issuer
-    name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
-  secretName: webhook-server-cert
+    dnsNames:
+        - {{ include "network-operator.resourceName" (dict "suffix" "webhook-service" "context" $) }}.{{ .Release.Namespace }}.svc
+        - {{ include "network-operator.resourceName" (dict "suffix" "webhook-service" "context" $) }}.{{ .Release.Namespace }}.svc.cluster.local
+    issuerRef:
+        kind: Issuer
+        name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
+    secretName: webhook-server-cert
 {{- end }}