diff --git a/helm/passbook/templates/appgw-deployment.yaml b/helm/passbook/templates/appgw-deployment.yaml deleted file mode 100644 index 00fcc43ee..000000000 --- a/helm/passbook/templates/appgw-deployment.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: apps/v1beta2 -kind: Deployment -metadata: - name: {{ include "passbook.fullname" . }}-appgw - labels: - app.kubernetes.io/name: {{ include "passbook.name" . }} - helm.sh/chart: {{ include "passbook.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "passbook.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "passbook.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - passbook.io/component: appgw - spec: - volumes: - - name: config-volume - configMap: - name: {{ include "passbook.fullname" . }}-config - containers: - - name: {{ .Chart.Name }} - image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}" - imagePullPolicy: IfNotPresent - command: - - ./manage.py - args: - - app_gw_web - envFrom: - - configMapRef: - name: {{ include "passbook.fullname" . }}-config - prefix: PASSBOOK_ - env: - - name: PASSBOOK_REDIS__PASSWORD - valueFrom: - secretKeyRef: - name: "{{ .Release.Name }}-redis" - key: redis-password - - name: PASSBOOK_POSTGRESQL__PASSWORD - valueFrom: - secretKeyRef: - name: "{{ .Release.Name }}-postgresql" - key: postgresql-password - ports: - - name: http - containerPort: 8000 - protocol: TCP - volumeMounts: - - mountPath: /etc/passbook - name: config-volume - livenessProbe: - httpGet: - path: / - port: http - httpHeaders: - - name: Host - value: kubernetes-healthcheck-host - readinessProbe: - httpGet: - path: / - port: http - httpHeaders: - - name: Host - value: kubernetes-healthcheck-host - resources: - requests: - cpu: 150m - memory: 300M - limits: - cpu: 500m - memory: 500M diff --git a/helm/passbook/templates/appgw-service.yaml b/helm/passbook/templates/appgw-service.yaml deleted file mode 100644 index 3e6c02d39..000000000 --- a/helm/passbook/templates/appgw-service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "passbook.fullname" . }}-appgw - labels: - app.kubernetes.io/name: {{ include "passbook.name" . }} - helm.sh/chart: {{ include "passbook.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "passbook.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - passbook.io/component: appgw diff --git a/helm/passbook/templates/ingress.yaml b/helm/passbook/templates/ingress.yaml index bfd9e9758..c5b31dcb1 100644 --- a/helm/passbook/templates/ingress.yaml +++ b/helm/passbook/templates/ingress.yaml @@ -37,14 +37,9 @@ spec: backend: serviceName: {{ $fullName }}-static servicePort: http - {{- end }} - {{- range .Values.ingress.app_gw_hosts }} - - host: {{ . | quote }} - http: - paths: - - path: / + - path: /robots.txt backend: - serviceName: {{ $fullName }}-appgw + serviceName: {{ $fullName }}-static servicePort: http {{- end }} {{- end }} diff --git a/helm/passbook/values.yaml b/helm/passbook/values.yaml index d3ec6b2b8..378580081 100644 --- a/helm/passbook/values.yaml +++ b/helm/passbook/values.yaml @@ -21,10 +21,6 @@ postgresql: postgresqlDatabase: passbook postgresqlPassword: foo -rabbitmq: - rabbitmq: - password: foo - service: type: ClusterIP port: 80 @@ -37,28 +33,7 @@ ingress: path: / hosts: - passbook.k8s.local - app_gw_hosts: - - '*.passbook.k8s.local' - defaultHost: passbook.k8s.local tls: [] # - secretName: chart-example-tls # hosts: # - passbook.k8s.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/passbook/core/static/robots.txt b/passbook/core/static/robots.txt new file mode 100644 index 000000000..1f53798bb --- /dev/null +++ b/passbook/core/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /