Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Add user management CR
Signed-off-by: YuChen <[email protected]>
  • Loading branch information
YuChen committed Aug 5, 2024
commit 7f39e9e555f2975ade7cba9a8d30b51b7853db71
2 changes: 1 addition & 1 deletion controllers/bootstrap/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -750,11 +750,11 @@ func (b *Bootstrap) InstallOrUpdateOpcon(forceUpdateODLMCRs bool) error {
configs := []string{
constant.MongoDBOpCon,
constant.IMOpCon,
constant.UserMgmtOpCon,
constant.IdpConfigUIOpCon,
constant.PlatformUIOpCon,
constant.KeyCloakOpCon,
constant.CommonServicePGOpCon,
constant.UserMgmtOpCon,
}

baseCon = constant.CSV4OpCon
Expand Down
81 changes: 44 additions & 37 deletions controllers/constant/odlm.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,50 @@ spec:
operand: ibm-im-operator
`

UserMgmtOpCon = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandConfig
metadata:
name: common-service
namespace: "{{ .ServicesNs }}"
labels:
operator.ibm.com/managedByCsOperator: "true"
annotations:
version: {{ .Version }}
spec:
services:
- name: ibm-user-management-operator
resources:
- apiVersion: operator.ibm.com/v1alpha1
labels:
app.kubernetes.io/created-by: ibm-user-management-operator
app.kubernetes.io/instance: accountiam-sample
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: accountiam
app.kubernetes.io/part-of: ibm-user-management-operator
kind: AccountIAM
name: accountiam-sample
- apiVersion: operator.ibm.com/v1alpha1
data:
spec:
bindings:
public-account-iam-config-dev:
configmap: account-iam-env-configmap-dev
public-bootstrap-creds:
secret: user-mgmt-bootstrap
public-ibmcloudca-secret:
secret: ibmcloud-cluster-ca-secret
public-mcsp-integration-details:
secret: mcsp-im-integration-details
description: Binding information that should be accessible to User Management adopters
operand: ibm-user-management-operator
registry: common-service
registryNamespace: {{ .ServicesNs }}
force: true
kind: OperandBindInfo
name: ibm-user-mgmt-bindinfo
`

IdpConfigUIOpCon = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandConfig
Expand Down Expand Up @@ -1064,43 +1108,6 @@ spec:
`
)

const (
UserMgmtOpCon = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandConfig
metadata:
name: common-service
namespace: "{{ .ServicesNs }}"
labels:
operator.ibm.com/managedByCsOperator: "true"
annotations:
version: {{ .Version }}
spec:
services:
- name: ibm-user-management-operator
resources:
- apiVersion: operator.ibm.com/v1alpha1
data:
spec:
bindings:
public-account-iam-config-dev:
configmap: account-iam-env-configmap-dev
public-bootstrap-creds:
secret: user-mgmt-bootstrap
public-ibmcloudca-secret:
secret: ibmcloud-cluster-ca-secret
public-mcsp-integration-details:
secret: mcsp-im-integration-details
description: Binding information that should be accessible to User Management adopters
operand: ibm-user-management-operator
registry: common-service
registryNamespace: {{ .ServicesNs }}
force: true
kind: OperandBindInfo
name: ibm-user-mgmt-bindinfo
`
)

const (
CommonServicePGOpCon = `
apiVersion: operator.ibm.com/v1alpha1
Expand Down