Skip to content

Update makefile to build Keycloak Jar #1779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibm-ci-bot merged 2 commits into from
Jan 30, 2024
Merged

Update makefile to build Keycloak Jar #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9402c02
Update makefile to build Keycloak Jar
Daniel-Fan Jan 29, 2024
96ffbeb
Update version suffix entry
Daniel-Fan Jan 30, 2024
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
32 changes: 30 additions & 2 deletions controllers/constant/odlm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down Expand Up @@ -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 = `
Expand Down Expand Up @@ -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 = `
Expand Down Expand Up @@ -387,6 +410,11 @@ spec:
commonWebUI: {}
switcheritem: {}
navconfiguration: {}
- name: ibm-idp-config-ui-operator-v4.4
spec:
commonWebUI: {}
switcheritem: {}
navconfiguration: {}
`

PlatformUIOpCon = `
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
10 changes: 10 additions & 0 deletions controllers/constant/serviceLabel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -88,4 +93,9 @@ const ServiceLabelTemplate = `
commonWebUI:
labels:
placeholder1: placeholder2
- name: ibm-idp-config-ui-operator-v4.4
spec:
commonWebUI:
labels:
placeholder1: placeholder2
`
80 changes: 80 additions & 0 deletions controllers/rules/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
52 changes: 52 additions & 0 deletions controllers/size/large_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
52 changes: 52 additions & 0 deletions controllers/size/large_ppc64le.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
52 changes: 52 additions & 0 deletions controllers/size/large_s390x.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading