Skip to content

Commit 0240745

Browse files
Jeremy-Cheng-stackJeremy-Cheng-stack
authored
Edb license job removed from odlm.go (#2760)
* Edb license job removed from odlm.go Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> * Remove rest of license resource and remove alternative secret reference Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> * Revert "Remove rest of license resource and remove alternative secret reference" This reverts commit e535382. Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> * Remove rest of license resource and remove alternative secret reference Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> * Remove postgresql-operator-request operand request from odlm.go Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> --------- Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com>
1 parent 4ac61f3 commit 0240745

File tree

2 files changed

+0
-321
lines changed

2 files changed

+0
-321
lines changed

‎internal/controller/bootstrap/init.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,6 @@ func (b *Bootstrap) InstallOrUpdateOpcon(forceUpdateODLMCRs bool, csInstance *ap
970970
constant.UserMgmtOpCon,
971971
constant.IdpConfigUIOpCon,
972972
constant.PlatformUIOpCon,
973-
constant.EDBOpCon,
974973
constant.KeyCloakOpCon,
975974
constant.CommonServicePGOpCon,
976975
constant.CommonServiceCNPGOpCon,

‎internal/controller/constant/odlm.go‎

Lines changed: 0 additions & 320 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,160 +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: batch/v1
1051-
kind: Job
1052-
name: create-postgres-license-config
1053-
namespace: "{{ $.OperatorNs }}"
1054-
labels:
1055-
operator.ibm.com/opreq-control: 'true'
1056-
data:
1057-
spec:
1058-
activeDeadlineSeconds: 600
1059-
backoffLimit: 5
1060-
template:
1061-
metadata:
1062-
annotations:
1063-
productID: 068a62892a1e4db39641342e592daa25
1064-
productMetric: FREE
1065-
productName: IBM Cloud Platform Common Services
1066-
spec:
1067-
imagePullSecrets:
1068-
- name: ibm-entitlement-key
1069-
affinity:
1070-
nodeAffinity:
1071-
requiredDuringSchedulingIgnoredDuringExecution:
1072-
nodeSelectorTerms:
1073-
- matchExpressions:
1074-
- key: kubernetes.io/arch
1075-
operator: In
1076-
values:
1077-
- amd64
1078-
- ppc64le
1079-
- s390x
1080-
initContainers:
1081-
- command:
1082-
- bash
1083-
- -c
1084-
- |
1085-
cat << EOF | kubectl apply -f -
1086-
apiVersion: v1
1087-
kind: Secret
1088-
type: Opaque
1089-
metadata:
1090-
name: postgresql-operator-controller-manager-config
1091-
data:
1092-
EDB_LICENSE_KEY: $(base64 /license_keys/edb/EDB_LICENSE_KEY | tr -d '\n')
1093-
EOF
1094-
image:
1095-
templatingValueFrom:
1096-
default:
1097-
required: true
1098-
configMapKeyRef:
1099-
name: cloud-native-postgresql-image-list
1100-
key: edb-postgres-license-provider-image
1101-
namespace: {{ $.OperatorNs }}
1102-
configMapKeyRef:
1103-
name: cloud-native-postgresql-operand-images-config
1104-
key: edb-postgres-license-provider-image
1105-
namespace: {{ $.OperatorNs }}
1106-
name: edb-license
1107-
resources:
1108-
limits:
1109-
cpu: 500m
1110-
memory: 512Mi
1111-
requests:
1112-
cpu: 100m
1113-
memory: 50Mi
1114-
securityContext:
1115-
allowPrivilegeEscalation: false
1116-
capabilities:
1117-
drop:
1118-
- ALL
1119-
privileged: false
1120-
readOnlyRootFilesystem: true
1121-
containers:
1122-
- command: ["bash", "-c"]
1123-
args:
1124-
- |
1125-
kubectl delete pods -l app.kubernetes.io/name=cloud-native-postgresql
1126-
kubectl annotate secret postgresql-operator-controller-manager-config ibm-license-key-applied="EDB Database with IBM License Key"
1127-
image:
1128-
templatingValueFrom:
1129-
default:
1130-
required: true
1131-
configMapKeyRef:
1132-
name: cloud-native-postgresql-image-list
1133-
key: edb-postgres-license-provider-image
1134-
namespace: {{ $.OperatorNs }}
1135-
configMapKeyRef:
1136-
name: cloud-native-postgresql-operand-images-config
1137-
key: edb-postgres-license-provider-image
1138-
namespace: {{ $.OperatorNs }}
1139-
name: restart-edb-pod
1140-
resources:
1141-
limits:
1142-
cpu: 500m
1143-
memory: 512Mi
1144-
requests:
1145-
cpu: 100m
1146-
memory: 50Mi
1147-
securityContext:
1148-
allowPrivilegeEscalation: false
1149-
capabilities:
1150-
drop:
1151-
- ALL
1152-
privileged: false
1153-
readOnlyRootFilesystem: true
1154-
hostIPC: false
1155-
hostNetwork: false
1156-
hostPID: false
1157-
restartPolicy: OnFailure
1158-
securityContext:
1159-
runAsNonRoot: true
1160-
serviceAccountName: edb-license-sa
1161-
- apiVersion: v1
1162-
kind: ServiceAccount
1163-
name: edb-license-sa
1164-
namespace: "{{ $.OperatorNs }}"
1165-
- apiVersion: rbac.authorization.k8s.io/v1
1166-
kind: Role
1167-
name: edb-license-role
1168-
namespace: "{{ $.OperatorNs }}"
1169-
data:
1170-
rules:
1171-
- apiGroups: [""]
1172-
resources: ["pods", "secrets"]
1173-
verbs: ["create", "update", "patch", "get", "list", "delete", "watch"]
1174-
- apiVersion: rbac.authorization.k8s.io/v1
1175-
kind: RoleBinding
1176-
name: edb-license-rolebinding
1177-
namespace: "{{ $.OperatorNs }}"
1178-
data:
1179-
subjects:
1180-
- kind: ServiceAccount
1181-
name: edb-license-sa
1182-
roleRef:
1183-
kind: Role
1184-
name: edb-license-role
1185-
apiGroup: rbac.authorization.k8s.io
1186-
{{- end }}
1187-
`
1188-
11891035
const (
11901036
KeyCloakOpCon = `
11911037
apiVersion: operator.ibm.com/v1alpha1
@@ -1905,143 +1751,6 @@ spec:
19051751
supportedLocales: [ "en", "de" , "es", "fr", "it", "ja", "ko", "pt_BR", "zh_CN", "zh_TW"]
19061752
- name: edb-keycloak
19071753
resources:
1908-
- apiVersion: batch/v1
1909-
kind: Job
1910-
force: true
1911-
name: create-postgres-license-config
1912-
namespace: "{{ .OperatorNs }}"
1913-
labels:
1914-
operator.ibm.com/opreq-control: 'true'
1915-
data:
1916-
spec:
1917-
activeDeadlineSeconds: 600
1918-
backoffLimit: 5
1919-
template:
1920-
metadata:
1921-
annotations:
1922-
productID: 068a62892a1e4db39641342e592daa25
1923-
productMetric: FREE
1924-
productName: IBM Cloud Platform Common Services
1925-
spec:
1926-
imagePullSecrets:
1927-
- name: ibm-entitlement-key
1928-
affinity:
1929-
nodeAffinity:
1930-
requiredDuringSchedulingIgnoredDuringExecution:
1931-
nodeSelectorTerms:
1932-
- matchExpressions:
1933-
- key: kubernetes.io/arch
1934-
operator: In
1935-
values:
1936-
- amd64
1937-
- ppc64le
1938-
- s390x
1939-
initContainers:
1940-
- command:
1941-
- bash
1942-
- -c
1943-
- |
1944-
cat << EOF | kubectl apply -f -
1945-
apiVersion: v1
1946-
kind: Secret
1947-
type: Opaque
1948-
metadata:
1949-
name: postgresql-operator-controller-manager-config
1950-
data:
1951-
EDB_LICENSE_KEY: $(base64 /license_keys/edb/EDB_LICENSE_KEY | tr -d '\n')
1952-
EOF
1953-
image:
1954-
templatingValueFrom:
1955-
default:
1956-
required: true
1957-
configMapKeyRef:
1958-
name: cloud-native-postgresql-image-list
1959-
key: edb-postgres-license-provider-image
1960-
namespace: {{ .OperatorNs }}
1961-
configMapKeyRef:
1962-
name: cloud-native-postgresql-operand-images-config
1963-
key: edb-postgres-license-provider-image
1964-
namespace: {{ $.OperatorNs }}
1965-
name: edb-license
1966-
resources:
1967-
limits:
1968-
cpu: 500m
1969-
memory: 512Mi
1970-
requests:
1971-
cpu: 100m
1972-
memory: 50Mi
1973-
securityContext:
1974-
allowPrivilegeEscalation: false
1975-
capabilities:
1976-
drop:
1977-
- ALL
1978-
privileged: false
1979-
readOnlyRootFilesystem: true
1980-
containers:
1981-
- command: ["bash", "-c"]
1982-
args:
1983-
- |
1984-
kubectl delete pods -l app.kubernetes.io/name=cloud-native-postgresql
1985-
kubectl annotate secret postgresql-operator-controller-manager-config ibm-license-key-applied="EDB Database with IBM License Key"
1986-
image:
1987-
templatingValueFrom:
1988-
default:
1989-
required: true
1990-
configMapKeyRef:
1991-
name: cloud-native-postgresql-image-list
1992-
key: edb-postgres-license-provider-image
1993-
namespace: {{ .OperatorNs }}
1994-
configMapKeyRef:
1995-
name: cloud-native-postgresql-operand-images-config
1996-
key: edb-postgres-license-provider-image
1997-
namespace: {{ $.OperatorNs }}
1998-
name: restart-edb-pod
1999-
resources:
2000-
limits:
2001-
cpu: 500m
2002-
memory: 512Mi
2003-
requests:
2004-
cpu: 100m
2005-
memory: 50Mi
2006-
securityContext:
2007-
allowPrivilegeEscalation: false
2008-
capabilities:
2009-
drop:
2010-
- ALL
2011-
privileged: false
2012-
readOnlyRootFilesystem: true
2013-
hostIPC: false
2014-
hostNetwork: false
2015-
hostPID: false
2016-
restartPolicy: OnFailure
2017-
securityContext:
2018-
runAsNonRoot: true
2019-
serviceAccountName: edb-license-sa
2020-
- apiVersion: v1
2021-
kind: ServiceAccount
2022-
name: edb-license-sa
2023-
namespace: "{{ .OperatorNs }}"
2024-
- apiVersion: rbac.authorization.k8s.io/v1
2025-
kind: Role
2026-
name: edb-license-role
2027-
namespace: "{{ .OperatorNs }}"
2028-
data:
2029-
rules:
2030-
- apiGroups: [""]
2031-
resources: ["pods", "secrets"]
2032-
verbs: ["create", "update", "patch", "get", "list", "delete", "watch"]
2033-
- apiVersion: rbac.authorization.k8s.io/v1
2034-
kind: RoleBinding
2035-
name: edb-license-rolebinding
2036-
namespace: "{{ .OperatorNs }}"
2037-
data:
2038-
subjects:
2039-
- kind: ServiceAccount
2040-
name: edb-license-sa
2041-
roleRef:
2042-
kind: Role
2043-
name: edb-license-role
2044-
apiGroup: rbac.authorization.k8s.io
20451754
- apiVersion: postgresql.k8s.enterprisedb.io/v1
20461755
data:
20471756
spec:
@@ -2050,15 +1759,6 @@ spec:
20501759
backup.velero.io/backup-volumes: pgdata,pg-wal
20511760
labels:
20521761
foundationservices.cloudpak.ibm.com: keycloak
2053-
description:
2054-
templatingValueFrom:
2055-
objectRef:
2056-
apiVersion: v1
2057-
kind: Secret
2058-
name: postgresql-operator-controller-manager-config
2059-
path: .metadata.annotations.ibm-license-key-applied
2060-
namespace: {{ .OperatorNs }}
2061-
required: true
20621762
bootstrap:
20631763
initdb:
20641764
database: keycloak
@@ -2120,17 +1820,6 @@ spec:
21201820
services:
21211821
- name: common-service-postgresql
21221822
resources:
2123-
- apiVersion: operator.ibm.com/v1alpha1
2124-
data:
2125-
spec:
2126-
requests:
2127-
- operands:
2128-
- name: cloud-native-postgresql-v1.25
2129-
registry: common-service
2130-
registryNamespace: {{ .ServicesNs }}
2131-
force: true
2132-
kind: OperandRequest
2133-
name: postgresql-operator-request
21341823
- apiVersion: cert-manager.io/v1
21351824
kind: Certificate
21361825
name: common-service-db-replica-tls-cert
@@ -2253,15 +1942,6 @@ spec:
22531942
inheritedMetadata:
22541943
labels:
22551944
foundationservices.cloudpak.ibm.com: cs-db
2256-
description:
2257-
templatingValueFrom:
2258-
objectRef:
2259-
apiVersion: v1
2260-
kind: Secret
2261-
name: postgresql-operator-controller-manager-config
2262-
path: .metadata.annotations.ibm-license-key-applied
2263-
namespace: {{ .OperatorNs }}
2264-
required: true
22651945
bootstrap:
22661946
initdb:
22671947
database: im

0 commit comments

Comments
 (0)