Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
803e068
Fix mountPath bug
hervedombya May 15, 2025
ae7aa3e
Add micro-app configuration fetching and status updates
hervedombya May 14, 2025
a7d4d1b
Add DefaultServicePort
hervedombya May 15, 2025
1d87612
Add ScalityUIComponentExposer creation and reconciliation
ZiyangLinScality May 20, 2025
46e4a34
Update ScalityUIComponentExposer to include Ingress creation and reco…
ZiyangLinScality May 20, 2025
bf781fa
Create ScalityUIComponentExposer ConfigMap and mount
ZiyangLinScality May 20, 2025
3343509
Add ScalityUIComponentExposer creation and verification in tests
ZiyangLinScality May 20, 2025
48dda69
ScalityUIComponentExposer tests with resource creation and verification
ZiyangLinScality May 20, 2025
ae1d41a
RING-50435 // Create ScalityUI Service
hervedombya May 20, 2025
2a23bce
Revert "RING-50435 // Create ScalityUI Service"
hervedombya May 21, 2025
b11977a
Add AppHistoryPath to ScalityUIComponentExposer and enhance reconcili…
ZiyangLinScality May 21, 2025
3f8efa9
Refactor ScalityUIComponentExposer API fields for consistency and sim…
ZiyangLinScality May 21, 2025
1eaa4e6
Update ScalityUI CRDs to include new fields and improve schema docume…
ZiyangLinScality May 21, 2025
d53517a
RING-50435 // Create ScalityUI Service
hervedombya May 20, 2025
6eb6ed4
Update ScalityUI and ScalityUIComponentExposer to standardize ConfigM…
ZiyangLinScality May 22, 2025
3bd742a
Add container port configuration to ScalityUI deployment
ZiyangLinScality May 23, 2025
f037441
Add new example manifests for dummy UI and Kind cluster, update Scali…
ZiyangLinScality May 23, 2025
1c04183
Implement ConfigFetcher interface for UI component configuration retr…
hervedombya May 22, 2025
4a5b688
Refactor ScalityUIComponent to use ConfigFetcher for configuration re…
hervedombya May 22, 2025
24c0604
Refactor K8sServiceProxyFetcher to use direct HTTP GET
hervedombya May 23, 2025
9274834
Add ScalityUIComponentExposer creation and reconciliation
ZiyangLinScality May 20, 2025
6a6c939
Refactor ScalityUIComponent and ScalityUIComponentExposer to standard…
ZiyangLinScality May 23, 2025
9e3f71f
Restore
ZiyangLinScality May 23, 2025
06f4085
Refactor ConfigMap volume and mount handling in ScalityUIComponentExp…
ZiyangLinScality May 22, 2025
2c95801
Restore to main
ZiyangLinScality May 26, 2025
54ef12d
Merge branch 'main' into feature/create-component-exposer
ZiyangLinScality May 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/v1alpha1/scalityuicomponentexposer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ import (
type ScalityUIComponentExposerSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file
ScalityUI string `json:"scality-ui"`
ScalityUIComponent string `json:"scality-ui-component"`
ScalityUI string `json:"scalityUI"`
ScalityUIComponent string `json:"scalityUIComponent"`
AppHistoryPath string `json:"appHistoryPath"`
}

// ScalityUIComponentExposerStatus defines the observed state of ScalityUIComponentExposer
Expand Down
11 changes: 7 additions & 4 deletions config/crd/bases/ui.scality.com_scalityuicomponentexposers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,19 @@ spec:
description: ScalityUIComponentExposerSpec defines the desired state of
ScalityUIComponentExposer
properties:
scality-ui:
appHistoryPath:
type: string
scalityUI:
description: |-
INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file
type: string
scality-ui-component:
scalityUIComponent:
type: string
required:
- scality-ui
- scality-ui-component
- appHistoryPath
- scalityUI
- scalityUIComponent
type: object
status:
description: ScalityUIComponentExposerStatus defines the observed state
Expand Down
34 changes: 34 additions & 0 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,40 @@ kind: ClusterRole
metadata:
name: manager-role
rules:
- apiGroups:
- apps
resources:
- deployments
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- configmaps
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- networking.k8s.io
resources:
- ingresses
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ui.scality.com
resources:
Expand Down
7 changes: 7 additions & 0 deletions examples-manifests/dummy-ui.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: ui.scality.com/v1alpha1
kind: ScalityUIComponent
metadata:
name: dummy-ui
namespace: ui
spec:
image: hervedombya/dummy-ui:1.0.2
11 changes: 11 additions & 0 deletions examples-manifests/kind-cluster.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
extraPortMappings:
- containerPort: 80
hostPort: 7780
protocol: TCP
- containerPort: 443
hostPort: 7443
protocol: TCP
2 changes: 1 addition & 1 deletion examples-manifests/scality-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
name: scality-ui
namespace: ui
spec:
image: ghcr.io/scality/metalk8s/shell-ui:v130.0.0-dev-130.0.0-alpha.2-77-gce11d6eff
image: ghcr.io/scality/metalk8s/shell-ui:v130.0.0-dev-130.0.0-beta.1-4-ga8548e723
productName: RING
2 changes: 1 addition & 1 deletion examples-manifests/service-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ spec:
ports:
- protocol: TCP
port: 80
targetPort: 8080
targetPort: 80
5 changes: 5 additions & 0 deletions internal/controller/scalityui_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ import (
uiscalitycomv1alpha1 "github.com/scality/ui-operator/api/v1alpha1"
)

const (
DefaultScalityUIName = "scality-ui"
DefaultScalityUINamespace = "ui"
)

// createConfigJSON creates a JSON config from the ScalityUI object
func createConfigJSON(scalityui *uiscalitycomv1alpha1.ScalityUI) ([]byte, error) {
configJSON := map[string]string{
Expand Down
Loading