Update

Signed-off-by: dviejokfs <[email protected]>

Author: dviejokfs

api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go

@@ -1368,6 +1368,13 @@ type FabricOperatorAPINetworkConfig struct {
 type FabricOperatorAPIAuth struct {
 	OIDCJWKS   string `json:"oidcJWKS"`
 	OIDCIssuer string `json:"oidcIssuer"`
+
+	// +kubebuilder:default:=""
+	OIDCAuthority string `json:"oidcAuthority"`
+	// +kubebuilder:default:=""
+	OIDCClientId string `json:"oidcClientId"`
+	// +kubebuilder:default:=""
+	OIDCScope string `json:"oidcScope"`
 }
 
 // FabricOperatorAPISpec defines the desired state of FabricOperatorAPI
@@ -1387,7 +1394,11 @@ type FabricOperatorAPISpec struct {
 	// +kubebuilder:validation:Default={}
 	Auth *FabricOperatorAPIAuth `json:"auth"`
 
+	// +kubebuilder:default:=""
+	LogoURL string `json:"logoUrl"`
+
 	HLFConfig FabricOperatorAPIHLFConfig `json:"hlfConfig"`
+
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable

charts/hlf-operator-api/templates/deployment.yaml

@@ -71,6 +71,18 @@ spec:
             - "--auth-jwks"
             - "{{ .Values.auth.oidcJWKS }}"
   {{ end }}
+  {{ if and .Values.auth.oidcAuthority .Values.auth.oidcScope .Values.auth.oidcClientId }}
+            - "--auth-authority"
+            - "{{ .Values.auth.oidcAuthority }}"
+            - "--auth-scope"
+            - "{{ .Values.auth.oidcScope }}"
+            - "--auth-client-id"
+            - "{{ .Values.auth.oidcClientId }}"
+  {{ end }}
+  {{ if .Values.logoUrl }}
+            - "--logo-url"
+            - "{{ .Values.logoUrl }}"
+   {{ end }}
           livenessProbe:
             httpGet:
               path: /playground

charts/hlf-operator-api/values.yaml

@@ -14,6 +14,12 @@ image:
 auth:
   oidcJWKS: ""
   oidcIssuer: ""
+  oidcAuthority: ""
+  oidcClientId: ""
+  oidcScope: ""
+
+logoUrl: "xxxxxx"
+
 
 hlf:
   mspID: ""

charts/hlf-operator-ui/values.yaml

@@ -13,6 +13,7 @@ image:
 
 
 logoUrl: ""
+
 auth:
   oidcAuthority: ""
   oidcClientId: ""

config/crd/bases/hlf.kungfusoftware.es_fabricoperatorapis.yaml

@@ -866,13 +866,25 @@ spec:
               auth:
                 nullable: true
                 properties:
+                  oidcAuthority:
+                    default: ""
+                    type: string
+                  oidcClientId:
+                    default: ""
+                    type: string
                   oidcIssuer:
                     type: string
                   oidcJWKS:
                     type: string
+                  oidcScope:
+                    default: ""
+                    type: string
                 required:
+                - oidcAuthority
+                - oidcClientId
                 - oidcIssuer
                 - oidcJWKS
+                - oidcScope
                 type: object
               env:
                 items:
@@ -1100,6 +1112,9 @@ spec:
                 required:
                 - ingressGateway
                 type: object
+              logoUrl:
+                default: ""
+                type: string
               replicas:
                 type: integer
               resources:
@@ -1177,6 +1192,7 @@ spec:
             - imagePullPolicy
             - ingress
             - istio
+            - logoUrl
             - replicas
             - tag
             type: object

controllers/operatorapi/operatorapi.go

@@ -488,9 +488,13 @@ func GetConfig(conf *hlfv1alpha1.FabricOperatorAPI) (*HLFOperatorAPIChart, error
 	if spec.Auth != nil {
 		auth.OIDCJWKS = spec.Auth.OIDCJWKS
 		auth.OIDCIssuer = spec.Auth.OIDCIssuer
+		auth.OIDCAuthority = spec.Auth.OIDCAuthority
+		auth.OIDCClientId = spec.Auth.OIDCClientId
+		auth.OIDCScope = spec.Auth.OIDCScope
 	}
 	var c = HLFOperatorAPIChart{
 		ReplicaCount: spec.Replicas,
+		LogoURL:      spec.LogoURL,
 		Image: Image{
 			Repository: spec.Image,
 			Tag:        spec.Tag,

controllers/operatorapi/types.go

@@ -10,26 +10,31 @@ type Image struct {
 	PullPolicy corev1.PullPolicy `json:"pullPolicy"`
 	Tag        string            `json:"tag"`
 }
+
 type ServiceAccount struct {
 	Create      bool              `json:"create"`
 	Annotations map[string]string `json:"annotations"`
 	Name        string            `json:"name"`
 }
+
 type Service struct {
 	Type string `json:"type"`
 	Port int    `json:"port"`
 }
+
 type Autoscaling struct {
 	Enabled                        bool `json:"enabled"`
 	MinReplicas                    int  `json:"minReplicas"`
 	MaxReplicas                    int  `json:"maxReplicas"`
 	TargetCPUUtilizationPercentage int  `json:"targetCPUUtilizationPercentage"`
 }
+
 type HLFConfig struct {
 	MspID         string           `json:"mspID"`
 	User          string           `json:"user"`
 	NetworkConfig HLFNetworkConfig `json:"networkConfig"`
 }
+
 type HLFNetworkConfig struct {
 	SecretName string `json:"secretName"`
 	Key        string `json:"key"`
@@ -47,13 +52,15 @@ type IngressHost struct {
 	Host  string        `json:"host"`
 	Paths []IngressPath `json:"paths"`
 }
+
 type IngressPath struct {
 	Path     string `json:"path"`
 	PathType string `json:"pathType"`
 }
 
 type HLFOperatorAPIChart struct {
 	ReplicaCount     int                           `json:"replicaCount"`
+	LogoURL          string                        `json:"logoUrl"`
 	Image            Image                         `json:"image"`
 	Hlf              HLFConfig                     `json:"hlf,omitempty"`
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets"`
@@ -69,6 +76,9 @@ type HLFOperatorAPIChart struct {
 }
 
 type Auth struct {
-	OIDCJWKS   string `json:"oidcJWKS"`
-	OIDCIssuer string `json:"oidcIssuer"`
+	OIDCJWKS      string `json:"oidcJWKS"`
+	OIDCIssuer    string `json:"oidcIssuer"`
+	OIDCAuthority string `json:"oidcAuthority"`
+	OIDCClientId  string `json:"oidcClientId"`
+	OIDCScope     string `json:"oidcScope"`
 }