Merge branch 'master' into fix/registrypullqps

uc-cdis · Aug 16, 2023 · cacadaa · cacadaa
2 parents c67c4cb + bfdd1c2
commit cacadaa
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-07-31T16:54:24Z",
+  "generated_at": "2023-08-10T17:51:06Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -78,7 +78,7 @@
       {
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_verified": false,
-        "line_number": 115,
+        "line_number": 122,
         "type": "Secret Keyword"
       }
     ],

diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
@@ -54,6 +54,13 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" \
           google-cloud-sdk-cbt \
           kubectl
 
+# install go - https://go.dev/doc/install
+RUN wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz \
+    && rm -rf /usr/local/go \
+    && tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
+ENV PATH="$PATH:/usr/local/go/bin"
+RUN go version
+
 #
 # install docker tools:
 #

diff --git a/files/squid_whitelist/web_whitelist b/files/squid_whitelist/web_whitelist
@@ -123,6 +123,7 @@ orcid.org
 pgp.mit.edu
 ppa.launchpad.net
 prometheus-community.github.io
+proxy.golang.org
 public.ecr.aws
 pubmirrors.dal.corespace.com
 reflector.westga.edu

diff --git a/gen3/bin/kube-setup-wts.sh b/gen3/bin/kube-setup-wts.sh
@@ -42,6 +42,8 @@ new_client() {
     "oidc_client_id": "$client_id",
     "oidc_client_secret": "$client_secret",
 
+    "aggregate_endpoint_allowlist": ["/authz/mapping"],
+
     "external_oidc": []
 }
 EOM

diff --git a/kube/services/argo/values.yaml b/kube/services/argo/values.yaml
@@ -5,6 +5,12 @@ controller:
     enabled: true
     servicePort: 9090
 
+  resources:
+    requests:
+      memory: 8Gi
+    limits:
+      memory: 8Gi
+
   podAnnotations:
     prometheus.io/scrape: "true"
     prometheus.io/path: /metrics
@@ -76,6 +82,11 @@ server:
   extraEnv:
   - name: ARGO_HTTP1
     value: "true"
+  resources:
+    requests:
+      memory: 8Gi
+    limits:
+      memory: 8Gi
 
 # -- Influences the creation of the ConfigMap for the workflow-controller itself.
 useDefaultArtifactRepo: true