Commit e1573f1c authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

update ingress API to non-beta

parent aa6ace54
......@@ -14,7 +14,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.3.0
version: 0.3.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
......
......@@ -13,7 +13,9 @@ metadata:
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/v1beta1.FrontendConfig: http-ssl-policy-minimum-12
spec:
backend:
serviceName: {{ .Values.APP_NAMESPACE }}
servicePort: 80
defaultBackend:
service:
name: {{ .Values.APP_NAMESPACE }}
port:
number: 80
{{- end }}
......@@ -21,9 +21,9 @@ ARTIFACTS := ${COMMON}/artifacts
BUILD_DIR := ${PWD}/build
## ENVIRONMENT VARIABLE FILES
include ${COMMON}/framework-env.sh
include ${COMMON}/env.sh
include env.sh
include ${COMMON}/framework.var
include ${COMMON}/common.var
include local.var
# Export all variables:
export
......@@ -50,7 +50,7 @@ include ${FRAMEWORK_DIR}/makefile_parts/shared.mk
include ${FRAMEWORK_DIR}/makefile_parts/vault.mk
include ${FRAMEWORK_DIR}/makefile_parts/config.mk
include ${FRAMEWORK_DIR}/makefile_parts/helm-develop.mk
## END OF CENTRALLY-SUPPLIED MAKEFILES
## END OF FRAMEWORK-SUPPLIED MAKEFILES
## LOCAL MAKEFILES IN COMMON
## END OF LOCAL MAKEFILES
......
......@@ -7,11 +7,11 @@ environment:
common:
# Settings specific to this sub-project that are common to all
# environment instances.
- env.sh
- common.var
local:
# Settings for specific environments; should be in the directory where
# "make" is run (e.g., "dev/", "prod/", etc.)
- env.sh
- local.var
makefile_parts:
framework:
......
......@@ -21,9 +21,9 @@ ARTIFACTS := ${COMMON}/artifacts
BUILD_DIR := ${PWD}/build
## ENVIRONMENT VARIABLE FILES
include ${COMMON}/framework-env.sh
include ${COMMON}/env.sh
include env.sh
include ${COMMON}/framework.var
include ${COMMON}/common.var
include local.var
# Export all variables:
export
......@@ -50,7 +50,7 @@ include ${FRAMEWORK_DIR}/makefile_parts/shared.mk
include ${FRAMEWORK_DIR}/makefile_parts/vault.mk
include ${FRAMEWORK_DIR}/makefile_parts/config.mk
include ${FRAMEWORK_DIR}/makefile_parts/helm-develop.mk
## END OF CENTRALLY-SUPPLIED MAKEFILES
## END OF FRAMEWORK-SUPPLIED MAKEFILES
## LOCAL MAKEFILES IN COMMON
## END OF LOCAL MAKEFILES
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment