Merge branch '3733-CI-Stmgr-Unittest-dev' into 3733-CI-Stmgr-Unittest

apache · Nov 13, 2021 · dbf2455 · dbf2455
2 parents b1e6519 + 721175d
commit dbf2455
Show file tree

Hide file tree

Showing 12 changed files with 493 additions and 495 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -183,7 +183,7 @@ py_repositories()
 # pip_repositories()
 
 # for pex repos
-PEX_WHEEL = "https://pypi.python.org/packages/18/92/99270775cfc5ddb60c19588de1c475f9ff2837a6e0bbd5eaa5286a6a472b/pex-2.1.9-py2.py3-none-any.whl"
+PEX_WHEEL = "https://pypi.python.org/packages/fa/c4/5dbdce75117b60b6ffec65bc92ac25ee873b84158a55cfbffa1d49db6eb1/pex-2.1.54-py2.py3-none-any.whl"
 
 PY_WHEEL = "https://pypi.python.org/packages/53/67/9620edf7803ab867b175e4fd23c7b8bd8eba11cb761514dcd2e726ef07da/py-1.4.34-py2.py3-none-any.whl"
 
@@ -218,8 +218,8 @@ http_file(
 
 http_file(
     name = "pex_src",
-    downloaded_file_path = "pex-2.1.9-py2.py3-none-any.whl",
-    sha256 = "5cad8d960c187541f71682fc938a843ef9092aab46f27b33ace7e570325e2626",
+    downloaded_file_path = "pex-2.1.54-py2.py3-none-any.whl",
+    sha256 = "e60b006abe8abfd3c3377128e22c33f30cc6dea89e2beb463cf8360e3626db62",
     urls = [PEX_WHEEL],
 )
 
@@ -251,9 +251,9 @@ http_archive(
 # 3rdparty C++ dependencies
 http_archive(
     name = "com_github_gflags_gflags",
-    sha256 = "ae27cdbcd6a2f935baa78e4f21f675649271634c092b1be01469440495609d0e",
-    strip_prefix = "gflags-2.2.1",
-    urls = ["https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"],
+    sha256 = "34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf",
+    strip_prefix = "gflags-2.2.2",
+    urls = ["https://github.com/gflags/gflags/archive/v2.2.2.tar.gz"],
 )
 
 http_archive(
@@ -292,10 +292,9 @@ http_archive(
 
 http_archive(
     name = "com_github_google_glog",
-    build_file = "@//:third_party/glog/glog.BUILD",
-    sha256 = "7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0",
-    strip_prefix = "glog-0.3.5",
-    urls = ["https://github.com/google/glog/archive/v0.3.5.tar.gz"],
+    sha256 = "21bc744fb7f2fa701ee8db339ded7dce4f975d0d55837a97be7d46e8382dea5a",
+    strip_prefix = "glog-0.5.0",
+    urls = ["https://github.com/google/glog/archive/v0.5.0.zip"],
 )
 
 http_archive(
@@ -355,17 +354,17 @@ http_archive(
 http_archive(
     name = "helm_mac",
     build_file = "@//:third_party/helm/helm.BUILD",
-    sha256 = "05c7748da0ea8d5f85576491cd3c615f94063f20986fd82a0f5658ddc286cdb1",
+    sha256 = "3a9efe337c61a61b3e160da919ac7af8cded8945b75706e401f3655a89d53ef5",
     strip_prefix = "darwin-amd64",
-    urls = ["https://get.helm.sh/helm-v3.0.2-darwin-amd64.tar.gz"],
+    urls = ["https://get.helm.sh/helm-v3.7.1-darwin-amd64.tar.gz"],
 )
 
 http_archive(
     name = "helm_linux",
     build_file = "@//:third_party/helm/helm.BUILD",
-    sha256 = "c6b7aa7e4ffc66e8abb4be328f71d48c643cb8f398d95c74d075cfb348710e1d",
+    sha256 = "6cd6cad4b97e10c33c978ff3ac97bb42b68f79766f1d2284cfd62ec04cd177f4",
     strip_prefix = "linux-amd64",
-    urls = ["https://get.helm.sh/helm-v3.0.2-linux-amd64.tar.gz"],
+    urls = ["https://get.helm.sh/helm-v3.7.1-linux-amd64.tar.gz"],
 )
 # end helm
 

diff --git a/deploy/kubernetes/gke/medium.yaml b/deploy/kubernetes/gke/medium.yaml
@@ -30,8 +30,9 @@ platform: gke
 # Number of replicas for the job binary in bookkeeper
 jobReplicas: 2
 
-# amount of memory to provide for API server
-apiServerMemory: 512M
+apiServer:
+  # amount of memory to provide for API server
+  memory: 512M
 
 # Number of replicas for storage bookies, memory and storage requirements 
 bookieReplicas: 5

diff --git a/deploy/kubernetes/gke/small.yaml b/deploy/kubernetes/gke/small.yaml
@@ -30,8 +30,9 @@ platform: gke
 # Number of replicas for the job binary in bookkeeper
 jobReplicas: 2
 
-# amount of memory to provide for API server
-apiServerMemory: 512M
+apiServer:
+  # amount of memory to provide for API server
+  memory: 512M
 
 # Number of replicas for storage bookies, memory and storage requirements 
 bookieReplicas: 3

diff --git a/deploy/kubernetes/helm/templates/tools.yaml b/deploy/kubernetes/helm/templates/tools.yaml
@@ -18,7 +18,7 @@
 {{- $platform := .Values.platform -}}
 {{- $jobReplicas := .Values.jobReplicas -}}
 {{- $defaultUrl := (printf "/api/v1/namespaces/%s/services/%s-ui:8889/proxy" .Release.Namespace .Release.Name) -}}
-{{- $apiServerMemory := .Values.apiServerMemory }}
+{{- $apiServerMemory := .Values.apiServer.memory }}
 
 apiVersion: v1
 kind: ConfigMap
@@ -112,8 +112,8 @@ spec:
             - >-
               heron-ui
               --port=8889
-              {{- if not (kindIs "invalid" .Values.heron.url) }}
-              --base-url={{ eq .Values.heron.url "-" | ternary $defaultUrl .Values.heron.url }}
+              {{- if not (kindIs "invalid" .Values.ui.url) }}
+              --base-url={{ eq .Values.ui.url "-" | ternary $defaultUrl .Values.ui.url }}
               {{- end }}
         - name: heron-apiserver
           image: {{ .Values.image }}
@@ -181,6 +181,14 @@ spec:
     - port: 8889
       targetPort: 8889
       protocol: TCP
+      {{- if .Values.ui.nodePort.enabled }}
+      nodePort: {{ .Values.ui.nodePort.port }}
+      {{- end }}
+  {{- if .Values.ui.nodePort.enabled }}
+  type: NodePort
+  {{- else }}
+  type: ClusterIP
+  {{- end }}      
   selector:
     app: {{ .Release.Name }}-tools
     release: {{ .Release.Name }}
@@ -203,6 +211,44 @@ spec:
     - port: 8888
       targetPort: 8888
       protocol: TCP
+      {{- if .Values.tracker.nodePort.enabled }}
+      nodePort: {{ .Values.tracker.nodePort.port }}
+      {{- end }}
+  {{- if .Values.tracker.nodePort.enabled }}
+  type: NodePort
+  {{- else }}
+  type: ClusterIP
+  {{- end }}
+  selector:
+    app: {{ .Release.Name }}-tools
+    release: {{ .Release.Name }}
+
+---
+##
+## Service to expose the heron-apiserver
+##
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-apiserver
+  labels:
+    app: {{ .Release.Name }}-tools
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+    - port: 9000
+      targetPort: 9000
+      protocol: TCP
+      {{- if .Values.apiServer.nodePort.enabled }}
+      nodePort: {{ .Values.apiServer.nodePort.port }}
+      {{- end }}
+  {{- if .Values.apiServer.nodePort.enabled }}
+  type: NodePort
+  {{- else }}
+  type: ClusterIP
+  {{- end }}
   selector:
     app: {{ .Release.Name }}-tools
     release: {{ .Release.Name }}
@@ -269,23 +315,3 @@ rules:
   verbs:
   - get
   - list
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-apiserver
-  labels:
-    app: {{ .Release.Name }}-tools
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    - port: 9000
-      targetPort: 9000
-      protocol: TCP
-  type: NodePort
-  selector:
-    app: {{ .Release.Name }}-tools
-    release: {{ .Release.Name }}
diff --git a/deploy/kubernetes/helm/values.yaml.template b/deploy/kubernetes/helm/values.yaml.template
@@ -36,9 +36,25 @@ imagePullPolicy: IfNotPresent
 # Number of replicas for the job binary in bookkeeper
 jobReplicas: 1
 
-# amount of memory to provide for API server
-apiServerMemory: 512M
-heron:
+apiServer:
+  # amount of memory to provide for API server
+  memory: 512M
+  nodePort:
+    enabled: false
+    # port can be left empty and Kubernetes will assign a random NodePort
+    port:
+
+tracker:
+  nodePort:
+    enabled: false
+    # port can be left empty and Kubernetes will assign a random NodePort
+    port:
+
+ui:
+  nodePort:
+    enabled: false
+    # port can be left empty and Kubernetes will assign a random NodePort
+    port:
   # set to `-` to set base-url to the default k8s proxy URL
   # set to `null` to remove the use of base_url
   url: "-"