Merge pull request #290 from RedHatInsights/set-frontend-environment-…

…replicas Set frontend environment replicas
RedHatInsights · Jan 6, 2025 · a4cc7cd · a4cc7cd
2 parents c903722 + 0b6c51b
commit a4cc7cd
Show file tree

Hide file tree

Showing 10 changed files with 865 additions and 701 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 
 # Binaries for programs and plugins
 *.exe

diff --git a/Makefile b/Makefile
@@ -251,8 +251,8 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 GOTESTSUM ?= $(LOCALBIN)/gotestsum
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.11.1
+KUSTOMIZE_VERSION ?= v5.5.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.4
 GOTESTSUM_VERSION ?= v1.9.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

diff --git a/apis/cloud.redhat.com/v1alpha1/zz_generated.deepcopy.go b/apis/cloud.redhat.com/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cloud.redhat.com_namespacepools.yaml b/config/crd/bases/cloud.redhat.com_namespacepools.yaml
diff --git a/config/crd/bases/cloud.redhat.com_namespacereservations.yaml b/config/crd/bases/cloud.redhat.com_namespacereservations.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: namespacereservations.cloud.redhat.com
 spec:
   group: cloud.redhat.com
@@ -39,14 +38,19 @@ spec:
           API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
@@ -25,36 +24,9 @@ rules:
   - cloud.redhat.com
   resources:
   - clowdenvironments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloud.redhat.com
-  resources:
-  - clowdenvironments/status
-  verbs:
-  - get
-- apiGroups:
-  - cloud.redhat.com
-  resources:
   - frontendenvironments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloud.redhat.com
-  resources:
   - namespacepools
+  - namespacereservations
   verbs:
   - create
   - delete
@@ -66,38 +38,20 @@ rules:
 - apiGroups:
   - cloud.redhat.com
   resources:
-  - namespacepools/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - cloud.redhat.com
-  resources:
-  - namespacepools/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloud.redhat.com
-  resources:
-  - namespacereservations
+  - clowdenvironments/status
   verbs:
-  - create
-  - delete
   - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - cloud.redhat.com
   resources:
+  - namespacepools/finalizers
   - namespacereservations/finalizers
   verbs:
   - update
 - apiGroups:
   - cloud.redhat.com
   resources:
+  - namespacepools/status
   - namespacereservations/status
   verbs:
   - get

diff --git a/controllers/cloud.redhat.com/helpers/frontends.go b/controllers/cloud.redhat.com/helpers/frontends.go
@@ -43,10 +43,12 @@ func CreateFrontendEnv(ctx context.Context, cl client.Client, namespaceName stri
 
 	frontendEnv = frontend.FrontendEnvironment{
 		Spec: frontend.FrontendEnvironmentSpec{
-			Hostname:        clowdEnv.Status.Hostname,
-			SSO:             ssoURL,
-			IngressClass:    clowdEnv.Spec.Providers.Web.IngressClass,
-			GenerateNavJSON: true,
+			Hostname:              clowdEnv.Status.Hostname,
+			SSO:                   ssoURL,
+			IngressClass:          clowdEnv.Spec.Providers.Web.IngressClass,
+			GenerateNavJSON:       true,
+			EnableAkamaiCacheBust: false,
+			DefaultReplicas:       func(i int32) *int32 { return &i }(1),
 		},
 	}