diff --git a/stable/hazelcast-enterprise/templates/mancenter-mcm-navmenu.yaml b/stable/hazelcast-enterprise/templates/mancenter-mcm-navmenu.yaml deleted file mode 100644 index 7c2107bf..00000000 --- a/stable/hazelcast-enterprise/templates/mancenter-mcm-navmenu.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if and .Values.mcm.enabled (not .Values.mcm.baseURL) -}} -apiVersion: integrations.sdk.management.ibm.com/v1beta1 -kind: NavMenuEntry -metadata: - name: hazelcast-management-center - labels: - app.kubernetes.io/name: {{ template "hazelcast.name" . }} - helm.sh/chart: {{ template "hazelcast.chart" . }} - app.kubernetes.io/instance: "{{ .Release.Name }}" - app.kubernetes.io/managed-by: "{{ .Release.Service }}" -spec: - target: "ManagementCenter" - name: "Hazelcast Management Center" - parentId: "applications" - roles: - - name: ClusterAdministrator - - name: Administrator - - name: Operator - - name: Viewer - url: http://{{ template "mancenter.fullname" . }}-{{ .Release.Namespace }}.{{ "{{" }} .OpenShiftBaseUrl {{ "}}" }} -{{- end }} \ No newline at end of file diff --git a/stable/hazelcast-enterprise/templates/mancenter-mcm-oidc-client-registration.yaml b/stable/hazelcast-enterprise/templates/mancenter-mcm-oidc-client-registration.yaml deleted file mode 100644 index 91ad6067..00000000 --- a/stable/hazelcast-enterprise/templates/mancenter-mcm-oidc-client-registration.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if and .Values.mcm.enabled (not .Values.mcm.baseURL) -}} -apiVersion: integrations.sdk.management.ibm.com/v1beta1 -kind: OidcClientRegistration -metadata: - name: {{ template "mancenter.fullname" . }}-oidcclientregistration - labels: - app.kubernetes.io/name: {{ template "hazelcast.name" . }} - helm.sh/chart: {{ template "hazelcast.chart" . }} - app.kubernetes.io/instance: "{{ .Release.Name }}" - app.kubernetes.io/managed-by: "{{ .Release.Service }}" -spec: - registration: - post_logout_redirect_uris: - - http://{{ template "mancenter.fullname" . }}-{{ .Release.Namespace }}.{{ "{{" }} .OpenShiftBaseUrl {{ "}}" }} - trusted_uri_prefixes: - - http://{{ template "mancenter.fullname" . }}-{{ .Release.Namespace }}.{{ "{{" }} .OpenShiftBaseUrl {{ "}}" }} - redirect_uris: - - http://{{ template "mancenter.fullname" . }}-{{ .Release.Namespace }}.{{ "{{" }} .OpenShiftBaseUrl {{ "}}" }}/oidc/auth - client_secret: - secretName: {{ template "mancenter.fullname" . }}-oidc-reg-secret - secretKey: client_secret - apply_client_secret: true -{{- end }} \ No newline at end of file diff --git a/stable/hazelcast-enterprise/templates/mancenter-mcm-route.yaml b/stable/hazelcast-enterprise/templates/mancenter-mcm-route.yaml deleted file mode 100644 index 43a3ae61..00000000 --- a/stable/hazelcast-enterprise/templates/mancenter-mcm-route.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.mcm.enabled -}} -kind: Route -apiVersion: route.openshift.io/v1 -metadata: - name: {{ template "mancenter.fullname" . }} - labels: - app.kubernetes.io/name: {{ template "hazelcast.name" . }} - helm.sh/chart: {{ template "hazelcast.chart" . }} - app.kubernetes.io/instance: "{{ .Release.Name }}" - app.kubernetes.io/managed-by: "{{ .Release.Service }}" -spec: - port: - targetPort: http - to: - kind: Service - name: {{ template "mancenter.fullname" . }} -{{- end }} \ No newline at end of file diff --git a/stable/hazelcast-enterprise/templates/mancenter-service.yaml b/stable/hazelcast-enterprise/templates/mancenter-service.yaml index 29e3f8a1..2d458363 100644 --- a/stable/hazelcast-enterprise/templates/mancenter-service.yaml +++ b/stable/hazelcast-enterprise/templates/mancenter-service.yaml @@ -5,12 +5,6 @@ metadata: {{- if .Values.mancenter.service.annotations }} annotations: {{ toYaml .Values.mancenter.service.annotations | indent 4 }} -{{ else if and .Values.mcm.enabled .Values.mcm.baseURL }} - annotations: - name: Hazelcast Management Center - id: applications - roles: ClusterAdministrator,Administrator,Operator,Viewer - url: "http://{{ template "mancenter.fullname" . }}-{{ .Release.Namespace }}.{{ .Values.mcm.baseURL }}" {{- end }} name: {{ template "mancenter.fullname" . }} labels: @@ -18,10 +12,6 @@ metadata: helm.sh/chart: {{ template "hazelcast.chart" . }} app.kubernetes.io/instance: "{{ .Release.Name }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" -{{- if and .Values.mcm.enabled .Values.mcm.baseURL }} - inmenu: "true" - target: ManagementCenter -{{- end }} {{- range $key, $value := .Values.mancenter.service.labels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml b/stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml index 231b05b4..0e6f5e7f 100644 --- a/stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml +++ b/stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml @@ -168,65 +168,7 @@ spec: {{- if .Values.mancenter.clusterConfig.create }} {{- $clusterConfigCommand = "./bin/mc-conf.sh cluster add --lenient=true -H /data -cc /config/hazelcast-client.yaml; " }} {{- end }} - {{- if and .Values.mcm.enabled (not .Values.mcm.baseURL) }} - - name: CLIENT_ID - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: CLIENT_ID - - name: CLIENT_SECRET - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: client_secret - - name: AUTHORIZE_ENDPOINT - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: AUTHORIZE_ENDPOINT - - name: USER_INFO_ENDPOINT - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: USER_INFO_ENDPOINT - - name: TOKEN_ENDPOINT - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: TOKEN_ENDPOINT - - name: JWK_ENDPOINT - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: JWK_ENDPOINT - - name: OIDC_ISSUER_URL - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: OIDC_ISSUER_URL - - name: TRUSTED_URI_PREFIX_0 - valueFrom: - secretKeyRef: - name: {{ template "mancenter.fullname" . }}-oidc-reg-secret - key: TRUSTED_URI_PREFIX_0 - - name: MC_INIT_CMD - value: "{{ $clusterConfigCommand }}./bin/mc-conf.sh security reset -H /data; ./bin/mc-conf.sh oidc configure -H /data \ - --client-id $(CLIENT_ID) \ - --client-secret $(CLIENT_SECRET) \ - --authorization-endpoint $(AUTHORIZE_ENDPOINT) \ - --user-info-endpoint $(USER_INFO_ENDPOINT) \ - --token-endpoint $(TOKEN_ENDPOINT) \ - --jwk-set-endpoint $(JWK_ENDPOINT) \ - --issuer $(OIDC_ISSUER_URL) \ - --groups-claim-name 'groups' \ - --admin-groups 'icpusers' \ - --read-write-groups 'icpusers' \ - --read-only-groups 'icpusers' \ - --metrics-only-groups 'icpusers' \ - --redirect-url $(TRUSTED_URI_PREFIX_0)/oidc/auth \ - --user-info-request-http-method POST \ - --send-client-info-in-token-request" - {{- else if .Values.mancenter.devMode.enabled }} + {{- if .Values.mancenter.devMode.enabled }} - name: MC_INIT_CMD value: "{{ $clusterConfigCommand }}./bin/mc-conf.sh dev-mode configure" {{- else if .Values.mancenter.clusterConfig.create }} diff --git a/stable/hazelcast-enterprise/values.yaml b/stable/hazelcast-enterprise/values.yaml index 175f089c..d0ffea50 100644 --- a/stable/hazelcast-enterprise/values.yaml +++ b/stable/hazelcast-enterprise/values.yaml @@ -25,12 +25,6 @@ cluster: # memberCount is the number Hazelcast members memberCount: 3 -# Required for IBM CP4MCM deployment -mcm: - enabled: false - # Base URL of MCM OpenShift must be defined for CP4MCM versions before 2.3 to enable Management Center at Navigation Menu. - # baseURL: apps.yellow-22.dev.multicloudops.io - # Hazelcast properties hazelcast: # enabled is a flag to enable Hazelcast application