diff --git a/k8s/infra/ldap/templates/deployment.yaml b/k8s/infra/ldap/templates/deployment.yaml index 6f91544..154b740 100644 --- a/k8s/infra/ldap/templates/deployment.yaml +++ b/k8s/infra/ldap/templates/deployment.yaml @@ -27,6 +27,8 @@ spec: cpu: 0.5 memory: "250Mi" env: + - name: LDAP_ROOT + value: "dc=home,dc=sosnovsky,dc=ca" - name: LDAP_ADMIN_USERNAME value: "admin" - name: LDAP_ADMIN_PASSWORD @@ -37,47 +39,50 @@ spec: ports: - name: tcp containerPort: 1389 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: phpldapadmin -# labels: -# app.kubernetes.io/name: phpldapadmin -# spec: -# replicas: 1 -# selector: -# matchLabels: -# app.kubernetes.io/name: phpldapadmin -# replicas: 1 -# template: -# metadata: -# labels: -# app.kubernetes.io/name: phpldapadmin -# spec: -# containers: -# - name: main -# image: osixia/phpldapadmin -# imagePullPolicy: IfNotPresent -# ports: -# - name: http -# containerPort: 80 -# protocol: TCP -# envFrom: -# - configMapRef: -# name: phpldapadmin-config -# readinessProbe: -# httpGet: -# path: / -# port: http -# livenessProbe: -# httpGet: -# path: / -# port: http -# resources: -# limits: -# cpu: 100m -# memory: 128Mi -# requests: -# cpu: 100m -# memory: 128Mi +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: phpldapadmin + labels: + app.kubernetes.io/name: phpldapadmin +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: phpldapadmin + replicas: 1 + template: + metadata: + labels: + app.kubernetes.io/name: phpldapadmin + spec: + containers: + - name: main + image: osixia/phpldapadmin:0.9.0 + imagePullPolicy: IfNotPresent + env: + - name: PHPLDAPADMIN_LDAP_HOSTS + value: ldap.{{.Release.Namespace}}.svc.cluster.local + ports: + - name: http + containerPort: 80 + protocol: TCP + envFrom: + - configMapRef: + name: phpldapadmin-config + readinessProbe: + httpGet: + path: / + port: http + livenessProbe: + httpGet: + path: / + port: http + resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi diff --git a/k8s/infra/ldap/templates/svc.yaml b/k8s/infra/ldap/templates/svc.yaml index b0e7939..9855b2a 100644 --- a/k8s/infra/ldap/templates/svc.yaml +++ b/k8s/infra/ldap/templates/svc.yaml @@ -13,3 +13,18 @@ spec: targetPort: tcp selector: app.kubernetes.io/name: ldap +--- +apiVersion: v1 +kind: Service +metadata: + name: phpldapadmin + labels: + app.kubernetes.io/name: phpldapadmin +spec: + type: ClusterIP + ports: + - name: http + port: 80 + targetPort: http + selector: + app.kubernetes.io/name: phpldapadmin