Skip to content

Commit 23e7412

Browse files
Remove rest of license resource and remove alternative secret reference
Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com>
1 parent 2fc4a8c commit 23e7412

File tree

2 files changed

+0
-117
lines changed

2 files changed

+0
-117
lines changed

internal/controller/bootstrap/init.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,6 @@ func (b *Bootstrap) InstallOrUpdateOpcon(forceUpdateODLMCRs bool) error {
969969
constant.UserMgmtOpCon,
970970
constant.IdpConfigUIOpCon,
971971
constant.PlatformUIOpCon,
972-
constant.EDBOpCon,
973972
constant.KeyCloakOpCon,
974973
constant.CommonServicePGOpCon,
975974
constant.CommonServiceCNPGOpCon,

internal/controller/constant/odlm.go

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,64 +1032,6 @@ spec:
10321032
`
10331033
)
10341034

1035-
const EDBOpCon = `
1036-
apiVersion: operator.ibm.com/v1alpha1
1037-
kind: OperandConfig
1038-
metadata:
1039-
name: common-service
1040-
namespace: "{{ .ServicesNs }}"
1041-
labels:
1042-
operator.ibm.com/managedByCsOperator: "true"
1043-
annotations:
1044-
version: {{ .Version }}
1045-
spec:
1046-
services:
1047-
{{- range .ServiceNames.PostgreSQL }}
1048-
- name: {{ . }}
1049-
resources:
1050-
- apiVersion: v1
1051-
kind: Secret
1052-
name: postgresql-operator-controller-manager-config
1053-
namespace: "{{ $.OperatorNs }}"
1054-
annotations:
1055-
postgresql-operator-controller-manager-ready:
1056-
templatingValueFrom:
1057-
objectRef:
1058-
apiVersion: v1
1059-
kind: Pod
1060-
labelSelector:
1061-
app.kubernetes.io/name: postgresql-operator-controller-manager
1062-
path: .metadata.name
1063-
namespace: {{ $.OperatorNs }}
1064-
required: true
1065-
- apiVersion: v1
1066-
kind: ServiceAccount
1067-
name: edb-license-sa
1068-
namespace: "{{ $.OperatorNs }}"
1069-
- apiVersion: rbac.authorization.k8s.io/v1
1070-
kind: Role
1071-
name: edb-license-role
1072-
namespace: "{{ $.OperatorNs }}"
1073-
data:
1074-
rules:
1075-
- apiGroups: [""]
1076-
resources: ["pods", "secrets"]
1077-
verbs: ["create", "update", "patch", "get", "list", "delete", "watch"]
1078-
- apiVersion: rbac.authorization.k8s.io/v1
1079-
kind: RoleBinding
1080-
name: edb-license-rolebinding
1081-
namespace: "{{ $.OperatorNs }}"
1082-
data:
1083-
subjects:
1084-
- kind: ServiceAccount
1085-
name: edb-license-sa
1086-
roleRef:
1087-
kind: Role
1088-
name: edb-license-role
1089-
apiGroup: rbac.authorization.k8s.io
1090-
{{- end }}
1091-
`
1092-
10931035
const (
10941036
KeyCloakOpCon = `
10951037
apiVersion: operator.ibm.com/v1alpha1
@@ -1809,46 +1751,6 @@ spec:
18091751
supportedLocales: [ "en", "de" , "es", "fr", "it", "ja", "ko", "pt_BR", "zh_CN", "zh_TW"]
18101752
- name: edb-keycloak
18111753
resources:
1812-
- apiVersion: v1
1813-
kind: Secret
1814-
name: postgresql-operator-controller-manager-config
1815-
namespace: "{{ .OperatorNs }}"
1816-
annotations:
1817-
postgresql-operator-controller-manager-ready:
1818-
templatingValueFrom:
1819-
objectRef:
1820-
apiVersion: v1
1821-
kind: Pod
1822-
labelSelector:
1823-
app.kubernetes.io/name: postgresql-operator-controller-manager
1824-
path: .metadata.name
1825-
namespace: {{ .OperatorNs }}
1826-
required: true
1827-
- apiVersion: v1
1828-
kind: ServiceAccount
1829-
name: edb-license-sa
1830-
namespace: "{{ .OperatorNs }}"
1831-
- apiVersion: rbac.authorization.k8s.io/v1
1832-
kind: Role
1833-
name: edb-license-role
1834-
namespace: "{{ .OperatorNs }}"
1835-
data:
1836-
rules:
1837-
- apiGroups: [""]
1838-
resources: ["pods", "secrets"]
1839-
verbs: ["create", "update", "patch", "get", "list", "delete", "watch"]
1840-
- apiVersion: rbac.authorization.k8s.io/v1
1841-
kind: RoleBinding
1842-
name: edb-license-rolebinding
1843-
namespace: "{{ .OperatorNs }}"
1844-
data:
1845-
subjects:
1846-
- kind: ServiceAccount
1847-
name: edb-license-sa
1848-
roleRef:
1849-
kind: Role
1850-
name: edb-license-role
1851-
apiGroup: rbac.authorization.k8s.io
18521754
- apiVersion: postgresql.k8s.enterprisedb.io/v1
18531755
data:
18541756
spec:
@@ -1857,15 +1759,6 @@ spec:
18571759
backup.velero.io/backup-volumes: pgdata,pg-wal
18581760
labels:
18591761
foundationservices.cloudpak.ibm.com: keycloak
1860-
description:
1861-
templatingValueFrom:
1862-
objectRef:
1863-
apiVersion: v1
1864-
kind: Secret
1865-
name: postgresql-operator-controller-manager-config
1866-
path: .metadata.annotations.postgresql-operator-controller-manager-ready
1867-
namespace: {{ .OperatorNs }}
1868-
required: true
18691762
bootstrap:
18701763
initdb:
18711764
database: keycloak
@@ -2060,15 +1953,6 @@ spec:
20601953
inheritedMetadata:
20611954
labels:
20621955
foundationservices.cloudpak.ibm.com: cs-db
2063-
description:
2064-
templatingValueFrom:
2065-
objectRef:
2066-
apiVersion: v1
2067-
kind: Secret
2068-
name: postgresql-operator-controller-manager-config
2069-
path: .metadata.annotations.postgresql-operator-controller-manager-ready
2070-
namespace: {{ .OperatorNs }}
2071-
required: true
20721956
bootstrap:
20731957
initdb:
20741958
database: im

0 commit comments

Comments
 (0)