From 143d000ed8f8fc016cb7e1d531fb6e37a8d73b66 Mon Sep 17 00:00:00 2001 From: Yechan Kim Date: Wed, 24 Mar 2021 16:52:31 +0900 Subject: [PATCH] Simplified the ingress rules template for Kubernetes --- tools_generator.sh | 68 ---------------------------------------------- version | 2 +- 2 files changed, 1 insertion(+), 69 deletions(-) diff --git a/tools_generator.sh b/tools_generator.sh index 469513b..e8805c7 100644 --- a/tools_generator.sh +++ b/tools_generator.sh @@ -971,74 +971,6 @@ spec: --- apiVersion: extensions/v1beta1 kind: Ingress -metadata: - name: ${ENVIRONMENT_EXCHANGE_NAME}-ingress-api-order - namespace: ${ENVIRONMENT_EXCHANGE_NAME} - annotations: - kubernetes.io/ingress.class: "nginx" - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then echo 'kubernetes.io/tls-acme: "true"'; fi) - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then echo "cert-manager.io/cluster-issuer: ${ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER}"; fi) - nginx.ingress.kubernetes.io/proxy-body-size: "2m" - nginx.ingress.kubernetes.io/configuration-snippet: | - limit_req zone=api burst=10 nodelay; - limit_req_log_level notice; - limit_req_status 429; -spec: - rules: - - host: $(echo ${HOLLAEX_CONFIGMAP_API_HOST} | cut -f3 -d "/") - http: - paths: - - path: /v2/order - backend: - serviceName: ${ENVIRONMENT_EXCHANGE_NAME}-server-api - servicePort: 10010 - - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then ingress_tls_snippets $HOLLAEX_CONFIGMAP_API_HOST; fi) ---- -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: ${ENVIRONMENT_EXCHANGE_NAME}-ingress-api-admin - namespace: ${ENVIRONMENT_EXCHANGE_NAME} - annotations: - kubernetes.io/ingress.class: "nginx" - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then echo 'kubernetes.io/tls-acme: "true"'; fi) - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then echo "cert-manager.io/cluster-issuer: ${ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER}"; fi) - nginx.ingress.kubernetes.io/proxy-body-size: "2m" -spec: - rules: - - host: $(echo ${HOLLAEX_CONFIGMAP_API_HOST} | cut -f3 -d "/") - http: - paths: - - path: /v2/admin - backend: - serviceName: ${ENVIRONMENT_EXCHANGE_NAME}-server-api - servicePort: 10010 - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then ingress_tls_snippets $HOLLAEX_CONFIGMAP_API_HOST; fi) ---- -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: ${ENVIRONMENT_EXCHANGE_NAME}-ingress-api-explorer - namespace: ${ENVIRONMENT_EXCHANGE_NAME} - annotations: - kubernetes.io/ingress.class: "nginx" - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then echo 'kubernetes.io/tls-acme: "true"'; fi) - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then echo "cert-manager.io/cluster-issuer: ${ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER}"; fi) - nginx.ingress.kubernetes.io/proxy-body-size: "2m" -spec: - rules: - - host: $(echo ${HOLLAEX_CONFIGMAP_API_HOST} | cut -f3 -d "/") - http: - paths: - - path: /explorer - backend: - serviceName: ${ENVIRONMENT_EXCHANGE_NAME}-server-api - servicePort: 10010 - $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_CERT_MANAGER_ISSUER" ]] && [[ "$ENVIRONMENT_KUBERNETES_INGRESS_SSL_ENABLE_SERVER" == true ]];then ingress_tls_snippets $HOLLAEX_CONFIGMAP_API_HOST; fi) ---- -apiVersion: extensions/v1beta1 -kind: Ingress metadata: name: ${ENVIRONMENT_EXCHANGE_NAME}-ingress-plugins namespace: ${ENVIRONMENT_EXCHANGE_NAME} diff --git a/version b/version index e8f41f0..ed35d09 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.0.8 \ No newline at end of file +2.0.9 \ No newline at end of file