diff --git a/proxy/kubernetes/proxy-deployment-qa-canary.yaml b/proxy/kubernetes/proxy-deployment-qa-canary.yaml new file mode 100644 index 000000000..78971c60d --- /dev/null +++ b/proxy/kubernetes/proxy-deployment-qa-canary.yaml @@ -0,0 +1,54 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + namespace: default + name: proxy-deployment-canary + labels: + app: proxy-canary +spec: + replicas: 3 + selector: + matchLabels: + app: proxy-canary + template: + metadata: + labels: + app: proxy-canary + spec: + containers: + - name: proxy-canary + image: gcr.io/GCP_PROJECT/proxy + ports: + - containerPort: 30000 + name: health-check + - containerPort: 30001 + name: whois + - containerPort: 30002 + name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois + readinessProbe: + tcpSocket: + port: health-check + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + tcpSocket: + port: health-check + initialDelaySeconds: 15 + periodSeconds: 20 + imagePullPolicy: Always + args: ["--env", "qa_canary", "--log"] + env: + - name: POD_ID + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: NAMESPACE_ID + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CONTAINER_NAME + value: proxy-canary diff --git a/proxy/kubernetes/proxy-deployment-qa.yaml b/proxy/kubernetes/proxy-deployment-qa.yaml new file mode 100644 index 000000000..32047b6d3 --- /dev/null +++ b/proxy/kubernetes/proxy-deployment-qa.yaml @@ -0,0 +1,54 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + namespace: default + name: proxy-deployment + labels: + app: proxy +spec: + replicas: 3 + selector: + matchLabels: + app: proxy + template: + metadata: + labels: + app: proxy + spec: + containers: + - name: proxy + image: gcr.io/GCP_PROJECT/proxy + ports: + - containerPort: 30000 + name: health-check + - containerPort: 30001 + name: whois + - containerPort: 30002 + name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois + readinessProbe: + tcpSocket: + port: health-check + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + tcpSocket: + port: health-check + initialDelaySeconds: 15 + periodSeconds: 20 + imagePullPolicy: Always + args: ["--env", "qa", "--log"] + env: + - name: POD_ID + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: NAMESPACE_ID + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CONTAINER_NAME + value: proxy diff --git a/proxy/src/main/java/google/registry/proxy/ProxyConfig.java b/proxy/src/main/java/google/registry/proxy/ProxyConfig.java index 79ea599c4..51c743fda 100644 --- a/proxy/src/main/java/google/registry/proxy/ProxyConfig.java +++ b/proxy/src/main/java/google/registry/proxy/ProxyConfig.java @@ -30,6 +30,8 @@ public class ProxyConfig { SANDBOX_CANARY, CRASH, CRASH_CANARY, + QA, + QA_CANARY, ALPHA, LOCAL, } diff --git a/proxy/src/main/java/google/registry/proxy/config/proxy-config-qa-canary.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-qa-canary.yaml new file mode 100644 index 000000000..ea71687e3 --- /dev/null +++ b/proxy/src/main/java/google/registry/proxy/config/proxy-config-qa-canary.yaml @@ -0,0 +1 @@ +# Add environment-specific proxy configuration here. diff --git a/proxy/src/main/java/google/registry/proxy/config/proxy-config-qa.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-qa.yaml new file mode 100644 index 000000000..ea71687e3 --- /dev/null +++ b/proxy/src/main/java/google/registry/proxy/config/proxy-config-qa.yaml @@ -0,0 +1 @@ +# Add environment-specific proxy configuration here.