diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go index da8875066..7803853b6 100644 --- a/controllers/constant/odlm.go +++ b/controllers/constant/odlm.go @@ -123,6 +123,14 @@ spec: installPlanApproval: {{ .ApprovalMode }} sourceName: {{ .CatalogSourceName }} sourceNamespace: "{{ .CatalogSourceNs }}" + - name: ibm-im-operator-v4.5 + namespace: "{{ .CPFSNs }}" + channel: v4.5 + packageName: ibm-iam-operator + scope: public + installPlanApproval: {{ .ApprovalMode }} + sourceName: {{ .CatalogSourceName }} + sourceNamespace: "{{ .CatalogSourceNs }}" ` IdpConfigUIOpReg = ` @@ -170,6 +178,14 @@ spec: installPlanApproval: {{ .ApprovalMode }} sourceName: {{ .CatalogSourceName }} sourceNamespace: "{{ .CatalogSourceNs }}" + - name: ibm-idp-config-ui-operator-v4.4 + namespace: "{{ .CPFSNs }}" + channel: v4.4 + packageName: ibm-commonui-operator-app + scope: public + installPlanApproval: {{ .ApprovalMode }} + sourceName: {{ .CatalogSourceName }} + sourceNamespace: "{{ .CatalogSourceNs }}" ` PlatformUIOpReg = ` @@ -353,6 +369,13 @@ spec: - name: ibm-im-mongodb-operator-v4.2 - name: ibm-idp-config-ui-operator-v4.3 registry: common-service + - name: ibm-im-operator-v4.5 + spec: + authentication: + config: + onPremMultipleDeploy: {{ .OnPremMultiEnable }} + operandBindInfo: + operand: ibm-im-operator ` IdpConfigUIOpCon = ` @@ -387,6 +410,11 @@ spec: commonWebUI: {} switcheritem: {} navconfiguration: {} + - name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: {} + switcheritem: {} + navconfiguration: {} ` PlatformUIOpCon = ` @@ -1128,7 +1156,7 @@ spec: sourceNamespace: "{{ .CatalogSourceNs }}" - name: ibm-idp-config-ui-operator namespace: "{{ .CPFSNs }}" - channel: v4.3 + channel: v4.4 packageName: ibm-commonui-operator-app scope: public installPlanApproval: {{ .ApprovalMode }} @@ -1505,7 +1533,7 @@ metadata: name: operand-deployment-lifecycle-manager-app namespace: "{{ .CPFSNs }}" spec: - channel: v4.2 + channel: v4.3 installPlanApproval: {{ .ApprovalMode }} name: ibm-odlm source: {{ .CatalogSourceName }} diff --git a/controllers/constant/serviceLabel.go b/controllers/constant/serviceLabel.go index cccdd1651..51c53bdbf 100644 --- a/controllers/constant/serviceLabel.go +++ b/controllers/constant/serviceLabel.go @@ -68,6 +68,11 @@ const ServiceLabelTemplate = ` authentication: labels: placeholder1: placeholder2 +- name: ibm-im-operator-v4.5 + spec: + authentication: + labels: + placeholder1: placeholder2 - name: ibm-idp-config-ui-operator-v4.0 spec: commonWebUI: @@ -88,4 +93,9 @@ const ServiceLabelTemplate = ` commonWebUI: labels: placeholder1: placeholder2 +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + labels: + placeholder1: placeholder2 ` diff --git a/controllers/rules/rules.go b/controllers/rules/rules.go index bc884e519..5863acab2 100644 --- a/controllers/rules/rules.go +++ b/controllers/rules/rules.go @@ -655,6 +655,62 @@ const ConfigurationRules = ` cpu: LARGEST_VALUE ephemeral-storage: LARGEST_VALUE memory: LARGEST_VALUE +- name: ibm-im-operator-v4.5 + spec: + authentication: + config: + fipsEnabled: LARGEST_VALUE + replicas: LARGEST_VALUE + authService: + resources: + limits: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + requests: + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + memory: LARGEST_VALUE + clientRegistration: + resources: + limits: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + requests: + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + memory: LARGEST_VALUE + identityManager: + resources: + limits: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + requests: + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + memory: LARGEST_VALUE + identityProvider: + resources: + limits: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + requests: + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + memory: LARGEST_VALUE + initMongodb: + resources: + limits: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + requests: + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + memory: LARGEST_VALUE - name: ibm-management-ingress-operator spec: managementIngress: @@ -882,6 +938,30 @@ const ConfigurationRules = ` cpu: LARGEST_VALUE memory: LARGEST_VALUE ephemeral-storage: LARGEST_VALUE +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: LARGEST_VALUE + resources: + requests: + memory: LARGEST_VALUE + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + limits: + memory: LARGEST_VALUE + cpu: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + commonWebUIConfig: + dashboardData: + resources: + limits: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE + requests: + cpu: LARGEST_VALUE + memory: LARGEST_VALUE + ephemeral-storage: LARGEST_VALUE - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/large_amd64.go b/controllers/size/large_amd64.go index cee735b2d..ccb396a72 100644 --- a/controllers/size/large_amd64.go +++ b/controllers/size/large_amd64.go @@ -529,6 +529,46 @@ const Large = ` ephemeral-storage: 256Mi cpu: 570m memory: 250Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 3 + authService: + resources: + limits: + cpu: 2000m + memory: 1090Mi + requests: + ephemeral-storage: 256Mi + cpu: 600m + memory: 540Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 1270Mi + requests: + ephemeral-storage: 256Mi + cpu: 260m + memory: 240Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 920Mi + requests: + ephemeral-storage: 256Mi + cpu: 570m + memory: 250Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Large = ` limits: memory: 660Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 3 + resources: + requests: + ephemeral-storage: 256Mi + memory: 490Mi + cpu: 450m + limits: + memory: 660Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/large_ppc64le.go b/controllers/size/large_ppc64le.go index 395976f15..72d3aceac 100644 --- a/controllers/size/large_ppc64le.go +++ b/controllers/size/large_ppc64le.go @@ -529,6 +529,46 @@ const Large = ` cpu: 410m memory: 335Mi replicas: 3 +- name: ibm-im-operator-v4.5 + spec: + authentication: + authService: + resources: + limits: + cpu: 3000m + memory: 1201Mi + requests: + ephemeral-storage: 256Mi + cpu: 725m + memory: 695Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 300Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 645Mi + requests: + ephemeral-storage: 256Mi + cpu: 340m + memory: 385Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 480Mi + requests: + ephemeral-storage: 256Mi + cpu: 410m + memory: 335Mi + replicas: 3 - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Large = ` ephemeral-storage: 256Mi cpu: 300m memory: 384Mi +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 3 + resources: + limits: + cpu: 1000m + memory: 1225Mi + requests: + ephemeral-storage: 256Mi + cpu: 300m + memory: 384Mi - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/large_s390x.go b/controllers/size/large_s390x.go index 210461193..7c4fcebb2 100644 --- a/controllers/size/large_s390x.go +++ b/controllers/size/large_s390x.go @@ -529,6 +529,46 @@ const Large = ` cpu: 410m memory: 335Mi replicas: 3 +- name: ibm-im-operator-v4.5 + spec: + authentication: + authService: + resources: + limits: + cpu: 2000m + memory: 745Mi + requests: + ephemeral-storage: 256Mi + cpu: 725m + memory: 695Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 530Mi + requests: + ephemeral-storage: 256Mi + cpu: 340m + memory: 385Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 480Mi + requests: + ephemeral-storage: 256Mi + cpu: 410m + memory: 335Mi + replicas: 3 - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Large = ` ephemeral-storage: 256Mi cpu: 300m memory: 384Mi +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 3 + resources: + limits: + cpu: 1000m + memory: 430Mi + requests: + ephemeral-storage: 256Mi + cpu: 300m + memory: 384Mi - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/medium_amd64.go b/controllers/size/medium_amd64.go index 950aeed3a..45455b48f 100644 --- a/controllers/size/medium_amd64.go +++ b/controllers/size/medium_amd64.go @@ -529,6 +529,46 @@ const Medium = ` ephemeral-storage: 256Mi cpu: 570m memory: 250Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 2 + authService: + resources: + limits: + cpu: 1000m + memory: 1090Mi + requests: + ephemeral-storage: 256Mi + cpu: 600m + memory: 540Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 1260Mi + requests: + ephemeral-storage: 256Mi + cpu: 260m + memory: 240Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 920Mi + requests: + ephemeral-storage: 256Mi + cpu: 570m + memory: 250Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Medium = ` limits: memory: 660Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 2 + resources: + requests: + ephemeral-storage: 256Mi + memory: 480Mi + cpu: 450m + limits: + memory: 660Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/medium_ppc64le.go b/controllers/size/medium_ppc64le.go index 9f4511aab..cec951c54 100644 --- a/controllers/size/medium_ppc64le.go +++ b/controllers/size/medium_ppc64le.go @@ -529,6 +529,46 @@ const Medium = ` cpu: 320m memory: 250Mi replicas: 2 +- name: ibm-im-operator-v4.5 + spec: + authentication: + authService: + resources: + limits: + cpu: 2000m + memory: 1193Mi + requests: + ephemeral-storage: 256Mi + cpu: 230m + memory: 695Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 300Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 639Mi + requests: + ephemeral-storage: 256Mi + cpu: 100m + memory: 140Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 438Mi + requests: + ephemeral-storage: 256Mi + cpu: 320m + memory: 250Mi + replicas: 2 - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Medium = ` ephemeral-storage: 256Mi cpu: 300m memory: 376Mi +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 2 + resources: + limits: + cpu: 1000m + memory: 1225Mi + requests: + ephemeral-storage: 256Mi + cpu: 300m + memory: 376Mi - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/medium_s390x.go b/controllers/size/medium_s390x.go index 7644120b8..3bffd490c 100644 --- a/controllers/size/medium_s390x.go +++ b/controllers/size/medium_s390x.go @@ -529,6 +529,46 @@ const Medium = ` cpu: 320m memory: 250Mi replicas: 2 +- name: ibm-im-operator-v4.5 + spec: + authentication: + authService: + resources: + limits: + cpu: 1000m + memory: 745Mi + requests: + ephemeral-storage: 256Mi + cpu: 230m + memory: 695Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 525Mi + requests: + ephemeral-storage: 256Mi + cpu: 100m + memory: 140Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 355Mi + requests: + ephemeral-storage: 256Mi + cpu: 320m + memory: 250Mi + replicas: 2 - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Medium = ` ephemeral-storage: 256Mi cpu: 300m memory: 376Mi +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 2 + resources: + limits: + cpu: 1000m + memory: 430Mi + requests: + ephemeral-storage: 256Mi + cpu: 300m + memory: 376Mi - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/small_amd64.go b/controllers/size/small_amd64.go index 6cd63fba9..e286c1a88 100644 --- a/controllers/size/small_amd64.go +++ b/controllers/size/small_amd64.go @@ -529,6 +529,46 @@ const Small = ` ephemeral-storage: 256Mi cpu: 570m memory: 250Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 1 + authService: + resources: + limits: + cpu: 1000m + memory: 1090Mi + requests: + ephemeral-storage: 256Mi + cpu: 600m + memory: 650Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 410Mi + requests: + ephemeral-storage: 256Mi + cpu: 260m + memory: 240Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 420Mi + requests: + ephemeral-storage: 256Mi + cpu: 570m + memory: 250Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Small = ` limits: memory: 440Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 1 + resources: + requests: + ephemeral-storage: 256Mi + memory: 256Mi + cpu: 130m + limits: + memory: 440Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/small_ppc64le.go b/controllers/size/small_ppc64le.go index a6517c052..e2c9abdbb 100644 --- a/controllers/size/small_ppc64le.go +++ b/controllers/size/small_ppc64le.go @@ -529,6 +529,46 @@ const Small = ` ephemeral-storage: 256Mi cpu: 80m memory: 130Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 1 + authService: + resources: + limits: + cpu: 2000m + memory: 950Mi + requests: + ephemeral-storage: 256Mi + cpu: 140m + memory: 525Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 300Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 350Mi + requests: + ephemeral-storage: 256Mi + cpu: 50m + memory: 120Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 250Mi + requests: + ephemeral-storage: 256Mi + cpu: 80m + memory: 130Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const Small = ` limits: memory: 800Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 1 + resources: + requests: + ephemeral-storage: 256Mi + memory: 256Mi + cpu: 150m + limits: + memory: 800Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/small_s390x.go b/controllers/size/small_s390x.go index 750e0152f..19d8f583a 100644 --- a/controllers/size/small_s390x.go +++ b/controllers/size/small_s390x.go @@ -529,6 +529,46 @@ const Small = ` ephemeral-storage: 256Mi cpu: 80m memory: 130Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 1 + authService: + resources: + limits: + cpu: 1000m + memory: 650Mi + requests: + ephemeral-storage: 256Mi + cpu: 140m + memory: 525Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 220Mi + requests: + ephemeral-storage: 256Mi + cpu: 50m + memory: 120Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 230Mi + requests: + ephemeral-storage: 256Mi + cpu: 80m + memory: 130Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -674,7 +714,19 @@ const Small = ` cpu: 150m limits: memory: 440Mi - cpu: 1000m + cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 1 + resources: + requests: + ephemeral-storage: 256Mi + memory: 256Mi + cpu: 150m + limits: + memory: 440Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/starterset_amd64.go b/controllers/size/starterset_amd64.go index cb707956a..741891e60 100644 --- a/controllers/size/starterset_amd64.go +++ b/controllers/size/starterset_amd64.go @@ -529,6 +529,46 @@ const StarterSet = ` ephemeral-storage: 256Mi cpu: 570m memory: 250Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 1 + authService: + resources: + limits: + cpu: 1000m + memory: 1090Mi + requests: + ephemeral-storage: 256Mi + cpu: 600m + memory: 650Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 410Mi + requests: + ephemeral-storage: 256Mi + cpu: 260m + memory: 240Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 420Mi + requests: + ephemeral-storage: 256Mi + cpu: 570m + memory: 250Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const StarterSet = ` limits: memory: 440Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 1 + resources: + requests: + ephemeral-storage: 256Mi + memory: 256Mi + cpu: 130m + limits: + memory: 440Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/starterset_ppc64le.go b/controllers/size/starterset_ppc64le.go index 1b40244fb..8a081ff9b 100644 --- a/controllers/size/starterset_ppc64le.go +++ b/controllers/size/starterset_ppc64le.go @@ -529,6 +529,46 @@ const StarterSet = ` ephemeral-storage: 256Mi cpu: 80m memory: 130Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 1 + authService: + resources: + limits: + cpu: 2000m + memory: 950Mi + requests: + ephemeral-storage: 256Mi + cpu: 140m + memory: 525Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 300Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 350Mi + requests: + ephemeral-storage: 256Mi + cpu: 50m + memory: 120Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 250Mi + requests: + ephemeral-storage: 256Mi + cpu: 80m + memory: 130Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -675,6 +715,18 @@ const StarterSet = ` limits: memory: 800Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 1 + resources: + requests: + ephemeral-storage: 256Mi + memory: 256Mi + cpu: 150m + limits: + memory: 800Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/controllers/size/starterset_s390x.go b/controllers/size/starterset_s390x.go index e38743fc4..b9420f444 100644 --- a/controllers/size/starterset_s390x.go +++ b/controllers/size/starterset_s390x.go @@ -531,6 +531,46 @@ const StarterSet = ` ephemeral-storage: 256Mi cpu: 80m memory: 130Mi +- name: ibm-im-operator-v4.5 + spec: + authentication: + replicas: 1 + authService: + resources: + limits: + cpu: 1000m + memory: 650Mi + requests: + ephemeral-storage: 256Mi + cpu: 140m + memory: 525Mi + clientRegistration: + resources: + limits: + cpu: 1000m + memory: 50Mi + requests: + ephemeral-storage: 256Mi + cpu: 20m + memory: 50Mi + identityManager: + resources: + limits: + cpu: 1000m + memory: 220Mi + requests: + ephemeral-storage: 256Mi + cpu: 50m + memory: 120Mi + identityProvider: + resources: + limits: + cpu: 1000m + memory: 230Mi + requests: + ephemeral-storage: 256Mi + cpu: 80m + memory: 130Mi - name: ibm-management-ingress-operator spec: managementIngress: @@ -677,6 +717,18 @@ const StarterSet = ` limits: memory: 440Mi cpu: 1000m +- name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: + replicas: 1 + resources: + requests: + ephemeral-storage: 256Mi + memory: 256Mi + cpu: 150m + limits: + memory: 440Mi + cpu: 1000m - name: ibm-platform-api-operator spec: platformApi: diff --git a/docs/cloudpak-integration.md b/docs/cloudpak-integration.md index 5b5258974..03fb17fcb 100644 --- a/docs/cloudpak-integration.md +++ b/docs/cloudpak-integration.md @@ -163,6 +163,9 @@ spec: - name: ibm-im-operator-v4.4 spec: authentication: {} + - name: ibm-im-operator-v4.5 + spec: + authentication: {} - name: ibm-healthcheck-operator spec: healthService: {} @@ -191,6 +194,11 @@ spec: commonWebUI: {} legacyHeader: {} navconfiguration: {} + - name: ibm-idp-config-ui-operator-v4.4 + spec: + commonWebUI: {} + legacyHeader: {} + navconfiguration: {} - name: ibm-idp-config-ui-operator spec: commonWebUI: {} diff --git a/hack/keycloak-themes/Makefile b/hack/keycloak-themes/Makefile index 79bfd4557..bd0cdf85b 100644 --- a/hack/keycloak-themes/Makefile +++ b/hack/keycloak-themes/Makefile @@ -1,4 +1,4 @@ -KEYCLOAK_THEME_DIR ?= $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) +KEYCLOAK_THEME_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) JAR_THEME_FILE ?= cloudpak-theme.jar default: cloudpak-theme.jar @@ -6,5 +6,5 @@ default: cloudpak-theme.jar .PHONY: cloudpak-theme.jar cloudpak-theme.jar: @echo "Building the keycloak jar theme..." - rm ./$(JAR_THEME_FILE) + rm $(KEYCLOAK_THEME_DIR)/$(JAR_THEME_FILE) (cd $(KEYCLOAK_THEME_DIR) && zip -r ./$(JAR_THEME_FILE) META-INF theme) \ No newline at end of file diff --git a/testdata/actual.yaml b/testdata/actual.yaml index 6d772da80..abfd1fb4d 100644 --- a/testdata/actual.yaml +++ b/testdata/actual.yaml @@ -221,6 +221,38 @@ } } }, + { + "name": "ibm-idp-config-ui-operator-v4.4", + "spec": { + "commonWebUI": { + "commonWebUIConfig": { + "dashboardData": { + "resources": { + "limits": { + "cpu": "3000m", + "memory": "600Mi" + }, + "requests": { + "cpu": "390m", + "memory": "380Mi" + } + } + } + }, + "replicas": 3, + "resources": { + "limits": { + "cpu": "1000m", + "memory": "660Mi" + }, + "requests": { + "cpu": "450m", + "memory": "490Mi" + } + } + } + } + }, { "name": "ibm-idp-config-ui-operator", "spec": { @@ -878,6 +910,74 @@ } } }, + { + "name": "ibm-im-operator-v4.5", + "spec": { + "authentication": { + "authService": { + "resources": { + "limits": { + "cpu": "2000m", + "memory": "1090Mi" + }, + "requests": { + "cpu": "400m", + "memory": "540Mi" + } + } + }, + "clientRegistration": { + "resources": { + "limits": { + "cpu": "1000m", + "memory": "50Mi" + }, + "requests": { + "cpu": "20m", + "memory": "50Mi" + } + } + }, + "identityManager": { + "resources": { + "limits": { + "cpu": "1000m", + "memory": "1270Mi" + }, + "requests": { + "cpu": "260m", + "memory": "210Mi" + } + } + }, + "identityProvider": { + "resources": { + "limits": { + "cpu": "1000m", + "memory": "920Mi" + }, + "requests": { + "cpu": "570m", + "memory": "210Mi" + } + } + }, + "initMongodb": { + "resources": { + "limits": { + "cpu": "100m", + "memory": "128Mi" + }, + "requests": { + "cpu": "100m", + "memory": "128Mi" + } + } + }, + "replicas": 3 + } + } + }, { "name": "ibm-ingress-nginx-operator", "spec": { diff --git a/testdata/expected.yaml b/testdata/expected.yaml index b2ed9c087..fe1d62379 100644 --- a/testdata/expected.yaml +++ b/testdata/expected.yaml @@ -221,6 +221,38 @@ } } }, + { + "name": "ibm-idp-config-ui-operator-v4.4", + "spec": { + "commonWebUI": { + "commonWebUIConfig": { + "dashboardData": { + "resources": { + "limits": { + "cpu": "3000m", + "memory": "600Mi" + }, + "requests": { + "cpu": "390m", + "memory": "380Mi" + } + } + } + }, + "replicas": 3, + "resources": { + "limits": { + "cpu": "1000m", + "memory": "660Mi" + }, + "requests": { + "cpu": "450m", + "memory": "490Mi" + } + } + } + } + }, { "name": " ibm-idp-config-ui-operator", "spec": { @@ -878,6 +910,74 @@ } } }, + { + "name": "ibm-im-operator-v4.5", + "spec": { + "authentication": { + "authService": { + "resources": { + "limits": { + "cpu": "2000m", + "memory": "1090Mi" + }, + "requests": { + "cpu": "400m", + "memory": "540Mi" + } + } + }, + "clientRegistration": { + "resources": { + "limits": { + "cpu": "1000m", + "memory": "50Mi" + }, + "requests": { + "cpu": "20m", + "memory": "50Mi" + } + } + }, + "identityManager": { + "resources": { + "limits": { + "cpu": "1000m", + "memory": "1270Mi" + }, + "requests": { + "cpu": "260m", + "memory": "210Mi" + } + } + }, + "identityProvider": { + "resources": { + "limits": { + "cpu": "1000m", + "memory": "920Mi" + }, + "requests": { + "cpu": "570m", + "memory": "210Mi" + } + } + }, + "initMongodb": { + "resources": { + "limits": { + "cpu": "100m", + "memory": "128Mi" + }, + "requests": { + "cpu": "100m", + "memory": "128Mi" + } + } + }, + "replicas": 3 + } + } + }, { "name": "ibm-ingress-nginx-operator", "spec": {