added k8s-gateway-api support (#165)

* added gateway api support * removed gateway config * added webdocs for gatewayapi --------- Signed-off-by: David Viejo <[email protected]> Co-authored-by: David Viejo <[email protected]>
hyperledger-bevel · May 29, 2023 · a08644a · a08644a
1 parent be62fa4
commit a08644a
Show file tree

Hide file tree

Showing 34 changed files with 8,760 additions and 11,918 deletions.
diff --git a/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go b/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go
@@ -176,6 +176,7 @@ type FabricPeerSpec struct {
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable
+	GatewayApi       *FabricGatewayApi    `json:"gatewayApi"`
 	Istio            *FabricIstio         `json:"istio"`
 	Gossip           FabricPeerSpecGossip `json:"gossip"`
 	ExternalEndpoint string               `json:"externalEndpoint"`
@@ -290,6 +291,21 @@ type FabricIstio struct {
 	IngressGateway string `json:"ingressGateway"`
 }
 
+type FabricGatewayApi struct {
+	// +optional
+	// +nullable
+	Port int `json:"port"`
+	// +nullable
+	// +kubebuilder:validation:Optional
+	// +optional
+	// +kubebuilder:validation:Default={}
+	Hosts []string `json:"hosts,omitempty"`
+	// +kubebuilder:validation:Default=hlf-gateway
+	GatewayName string `json:"gatewayName"`
+	// +kubebuilder:validation:Default=default
+	GatewayNamespace string `json:"gatewayNamespace"`
+}
+
 type FabricPeerSpecGossip struct {
 	ExternalEndpoint  string `json:"externalEndpoint"`
 	Bootstrap         string `json:"bootstrap"`
@@ -510,11 +526,13 @@ type FabricOrdererNodeSpec struct {
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable
-	Istio *FabricIstio `json:"istio"`
+	GatewayApi *FabricGatewayApi `json:"gatewayApi"`
+	Istio      *FabricIstio      `json:"istio"`
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable
-	AdminIstio *FabricIstio `json:"adminIstio"`
+	AdminGatewayApi *FabricGatewayApi `json:"adminGatewayApi"`
+	AdminIstio      *FabricIstio      `json:"adminIstio"`
 
 	// +nullable
 	// +kubebuilder:validation:Optional
@@ -626,8 +644,9 @@ type FabricCASpec struct {
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable
-	Istio    *FabricIstio     `json:"istio"`
-	Database FabricCADatabase `json:"db"`
+	GatewayApi *FabricGatewayApi `json:"gatewayApi"`
+	Istio      *FabricIstio      `json:"istio"`
+	Database   FabricCADatabase  `json:"db"`
 	// +kubebuilder:validation:MinItems=1
 	// Hosts for the Fabric CA
 	Hosts   []string            `json:"hosts"`

diff --git a/api/hlf.kungfusoftware.es/v1alpha1/zz_generated.deepcopy.go b/api/hlf.kungfusoftware.es/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/hlf-ca/templates/tls-route.yaml b/charts/hlf-ca/templates/tls-route.yaml
@@ -0,0 +1,19 @@
+{{- if and (not .Values.istio.hosts) (and (.Values.gatewayApi.hosts) (.Values.gatewayApi.gatewayName)) -}}
+apiVersion: gateway.networking.k8s.io/v1alpha2
+kind: TLSRoute
+metadata:
+  name: {{ include "hlf-ca.fullname" . }}-tlsroute
+spec:
+  parentRefs:
+    - name: {{.Values.gatewayApi.gatewayName}}
+      sectionName: tcp
+      namespace: {{.Values.gatewayApi.gatewayNamespace}}
+  hostnames:
+  {{- range .Values.gatewayApi.hosts }}
+      - {{ . }}
+  {{- end }}
+  rules:
+    - backendRefs:
+        - name: {{ include "hlf-ca.fullname" . }}
+          port: 7054
+{{- end -}}
diff --git a/charts/hlf-ca/values.yaml b/charts/hlf-ca/values.yaml
@@ -20,4 +20,10 @@ istio:
   hosts: []
   ingressGateway: ingressgateway
 
-envVars: []
+gatewayApi:
+  port: 443
+  hosts: []
+  gatewayName: ""
+  gatewayNamespace: ""
+
+envVars: []
diff --git a/charts/hlf-ordnode/templates/tlsroute-admin.yaml b/charts/hlf-ordnode/templates/tlsroute-admin.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.channelParticipationEnabled (and (not .Values.adminIstio.hosts) (and (.Values.adminGatewayApi.hosts) (.Values.adminGatewayApi.gatewayName)))  -}}
+apiVersion: gateway.networking.k8s.io/v1alpha2
+kind: TLSRoute
+metadata:
+  name: {{ include "hlf-ordnode.fullname" . }}-tlsroute-admin
+spec:
+  parentRefs:
+    - name: {{.Values.adminGatewayApi.gatewayName}}
+      sectionName: tcp
+      namespace: {{.Values.gatewayApi.gatewayNamespace}}
+  hostnames:
+  {{- range .Values.adminGatewayApi.hosts }}
+      - {{ . }}
+  {{- end }}
+  rules:
+    - backendRefs:
+        - name: {{ include "hlf-ordnode.fullname" . }}
+          port: 7053
+{{- end -}}
diff --git a/charts/hlf-ordnode/templates/tlsroute.yaml b/charts/hlf-ordnode/templates/tlsroute.yaml
@@ -0,0 +1,19 @@
+{{- if and (not .Values.istio.hosts) (and (.Values.gatewayApi.hosts) (.Values.gatewayApi.gatewayName)) -}}
+apiVersion: gateway.networking.k8s.io/v1alpha2
+kind: TLSRoute
+metadata:
+  name: {{ include "hlf-ordnode.fullname" . }}-tlsroute
+spec:
+  parentRefs:
+    - name: {{.Values.gatewayApi.gatewayName}}
+      sectionName: tcp
+      namespace: {{.Values.gatewayApi.gatewayNamespace}}
+  hostnames:
+  {{- range .Values.gatewayApi.hosts }}
+      - {{ . }}
+  {{- end }}
+  rules:
+    - backendRefs:
+        - name: {{ include "hlf-ordnode.fullname" . }}
+          port: 7050
+{{- end -}}
diff --git a/charts/hlf-ordnode/values.yaml b/charts/hlf-ordnode/values.yaml
@@ -60,6 +60,18 @@ adminIstio:
   hosts: []
   ingressGateway: ingressgateway
 
+gatewayApi:
+  port: 443
+  hosts: []
+  gatewayName: "hlf-gateway"
+  gatewayNamespace: ""
+
+adminGatewayApi:
+  port: 443
+  hosts: []
+  gatewayName: "hlf-gateway"
+  gatewayNamespace: ""
+
 
 serviceMonitor:
   ## If true, a ServiceMonitor CRD is created for a prometheus operator

diff --git a/charts/hlf-peer/templates/tls-route.yaml b/charts/hlf-peer/templates/tls-route.yaml
@@ -0,0 +1,19 @@
+{{- if and (not .Values.istio.hosts) (and (.Values.gatewayApi.hosts) (.Values.gatewayApi.gatewayName)) -}}
+apiVersion: gateway.networking.k8s.io/v1alpha2
+kind: TLSRoute
+metadata:
+  name: {{ include "hlf-peer.fullname" . }}-tlsroute
+spec:
+  parentRefs:
+    - name: {{.Values.gatewayApi.gatewayName}}
+      sectionName: tcp
+      namespace: {{.Values.gatewayApi.gatewayNamespace}}
+  hostnames:
+  {{- range .Values.gatewayApi.hosts }}
+      - {{ . }}
+  {{- end }}
+  rules:
+    - backendRefs:
+        - name: {{ include "hlf-peer.fullname" . }}
+          port: 7051
+{{- end -}}
diff --git a/charts/hlf-peer/values.yaml b/charts/hlf-peer/values.yaml
@@ -203,4 +203,9 @@ couchdbPassword: "couchdb"
 opsTLS:
   key: ""
   cert: ""
+gatewayApi:
+  port: 443
+  hosts: []
+  gatewayName: "hlf-gateway"
+  gatewayNamespace: ""