X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fpostgres%2Ftemplates%2Fdeployment-primary.yaml;h=535eefa8cfb2042484bbfac9f52f6ae905d94413;hb=refs%2Fheads%2Fmaster;hp=9cb3007400f761750e8104076f9a1f94d185568f;hpb=b97b5b43213a4e211719482fd306a485f794fd66;p=oom.git

diff --git a/kubernetes/common/postgres/templates/deployment-primary.yaml b/kubernetes/common/postgres/templates/deployment-primary.yaml
index 9cb3007400..535eefa8cf 100644
--- a/kubernetes/common/postgres/templates/deployment-primary.yaml
+++ b/kubernetes/common/postgres/templates/deployment-primary.yaml
@@ -13,126 +13,6 @@
 # # See the License for the specific language governing permissions and
 # # limitations under the License.
 */}}
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}-primary
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}-primary
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    name: "{{ .Values.container.name.primary }}"
-spec:
-  serviceName: {{ .Values.service.name }}
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}-primary
-        release: {{ .Release.Name }}
-        name: "{{ .Values.container.name.primary }}"
-    spec:
-      initContainers:
-      - name: init-sysctl
-        command:
-        - /bin/sh
-        - -c
-        - |
-          chown 26:26 /podroot/;
-          chmod 700 /podroot/;
-        image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.busyboxImage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - name: {{ include "common.fullname" . }}-data
-          mountPath: /podroot/
-      containers:
-      - name: {{ include "common.name" . }}
-        image: "{{ .Values.postgresRepository }}/{{ .Values.image }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        ports:
-        - containerPort: {{ .Values.service.internalPort }}
-          name: {{ .Values.service.portName }}
-        # disable liveness probe when breakpoints set in debugger
-        # so K8s doesn't restart unresponsive container
-        {{- if eq .Values.liveness.enabled true }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.liveness.periodSeconds }}
-          timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
-        {{- end }}
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readiness.periodSeconds }}
-        env:
-        - name: PGHOST
-          value: /tmp
-        - name: PG_PRIMARY_USER
-          value: primaryuser
-        - name: PG_MODE
-          value: primary
-        - name: PG_PRIMARY_HOST
-          value: "{{ .Values.container.name.primary }}"
-        - name: PG_REPLICA_HOST
-          value: "{{ .Values.container.name.replica }}"
-        - name: PG_PRIMARY_PORT
-          value: "{{ .Values.service.internalPort }}"
-        - name: PG_PRIMARY_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "common.fullname" . }}
-              key: pg-primary-password
-        - name: PG_USER
-          value: "{{ .Values.config.pgUserName }}"
-        - name: PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "common.fullname" . }}
-              key: pg-user-password
-        - name: PG_DATABASE
-          value: "{{ .Values.config.pgDatabase }}"
-        - name: PG_ROOT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "common.fullname" . }}
-              key: pg-root-password
-        volumeMounts:
-        - name: pool-hba-conf
-          mountPath: /pgconf/pool_hba.conf
-          subPath: pool_hba.conf
-        - mountPath: /pgdata
-          name: {{ include "common.fullname" . }}-data
-        - mountPath: /backup
-          name: {{ include "common.fullname" . }}-backup
-          readOnly: true
-        resources:
-{{ include "common.resources" . | indent 12 }}
-        {{- if .Values.nodeSelector }}
-        nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-        affinity:
-{{ toYaml .Values.affinity | indent 10 }}
-        {{- end }}
-      volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
-      - name: {{ include "common.fullname" . }}-backup
-        emptyDir: {}
-      - name: {{ include "common.fullname" . }}-data
-{{- if .Values.persistence.enabled }}
-        persistentVolumeClaim:
-            claimName: {{ include "common.fullname" . }}-primary
-{{- else }}
-        emptyDir: {}
-{{ end }}
-      - name: pool-hba-conf
-        configMap:
-          name: {{ include "common.fullname" . }}
+{{- if not .Values.global.postgres.useOperator }}
+{{ include "common.postgres.deployment" (dict "dot" . "pgMode" "primary") }}
+{{- end }}
\ No newline at end of file