Merge branch 'master' into arm

sillsdev · Nov 15, 2024 · 28a2ced · 28a2ced
2 parents 3fd2eb2 + 6e1b47c
commit 28a2ced
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 27 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -73,12 +73,10 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.github.com:443
-            api.codecov.io:443
             cli.codecov.io:443
-            codecov.io:443
             github.com:443
+            ingest.codecov.io:443
             storage.googleapis.com:443
-            uploader.codecov.io:443
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Download coverage artifact

diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml
@@ -25,6 +25,7 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             *.actions.githubusercontent.com:443
+            *.cloudfront.net:443
             *.data.mcr.microsoft.com:443
             api.ecr-public.us-east-1.amazonaws.com:443
             api.github.com:443

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -89,12 +89,10 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.github.com:443
-            api.codecov.io:443
             cli.codecov.io:443
-            codecov.io:443
             github.com:443
+            ingest.codecov.io:443
             storage.googleapis.com:443
-            uploader.codecov.io:443
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Download coverage artifact

diff --git a/README.md b/README.md
@@ -731,16 +731,20 @@ Install the Kubernetes resources to run _The Combine_ by running:
 python deploy/scripts/setup_combine.py [--target <target_name>] [--tag <image_tag>]
 ```
 
-The default target is `localhost`; the default tag is `latest`. For development testing the script will usually be run
-with no arguments.
+Notes:
 
-If an invalid target is entered, the script will list available targets and prompt the user his/her selection.
-`deploy/scripts/setup_combine.py` assumes that the `kubectl` configuration file is setup to manage the desired
-Kubernetes cluster. For most development users, there will only be the _Rancher Desktop/Docker Desktop_ cluster to
-manage and the installation process will set that up correctly. If there are multiple clusters to manage, the
-`--kubeconfig` and `--context` options will let you specify a different cluster.
+- The default target is `localhost`; the default tag is `latest`. For development testing the script will usually be run
+  with no arguments.
 
-Run the script with the `--help` option to see possible options for the script.
+- If an invalid target is entered, the script will list available targets and prompt the user his/her selection.
+  `deploy/scripts/setup_combine.py` assumes that the `kubectl` configuration file is setup to manage the desired
+  Kubernetes cluster. For most development users, there will only be the _Rancher Desktop/Docker Desktop_ cluster to
+  manage and the installation process will set that up correctly. If there are multiple clusters to manage, the
+  `--kubeconfig` and `--context` options will let you specify a different cluster.
+
+- Run the script with the `--help` option to see possible options for the script.
+
+- The setup assumes `amd64` architecture. If the target architecture is `arm64`, add `--set global.cpuArch=arm64`.
 
 When the script completes, the resources will be installed on the specified cluster. It may take a few moments before
 all the containers are up and running. If you are using _Rancher Desktop_, you can use the
@@ -749,22 +753,25 @@ all the containers are up and running. If you are using _Rancher Desktop_, you c
 
 ```console
 $ kubectl -n thecombine get deployments
-NAME          READY   UP-TO-DATE   AVAILABLE   AGE
-backend       1/1     1            1           10m
-database      1/1     1            1           10m
-frontend      1/1     1            1           10m
-maintenance   1/1     1            1           10m
+NAME                           READY   UP-TO-DATE   AVAILABLE   AGE
+backend                        1/1     1            1           10m
+database                       1/1     1            1           10m
+frontend                       1/1     1            1           10m
+maintenance                    1/1     1            1           10m
+otel-opentelemetry-collector   1/1     1            1           19m
 ```
 
 or
 
 ```console
 $ kubectl -n thecombine get pods
-NAME                           READY   STATUS    RESTARTS   AGE
-backend-5657559949-z2flp       1/1     Running   0          10m
-database-794b4d956f-zjszm      1/1     Running   0          10m
-frontend-7d6d79f8c5-lkhhz      1/1     Running   0          10m
-maintenance-7f4b5b89b8-rhgk9   1/1     Running   0          10m
+NAME                                            READY   STATUS      RESTARTS   AGE
+backend-5657559949-z2flp                        1/1     Running     0          10m
+database-794b4d956f-zjszm                       1/1     Running     0          10m
+frontend-7d6d79f8c5-lkhhz                       1/1     Running     0          10m
+install-fonts-4jcsl                             0/1     Completed   0          8m
+maintenance-7f4b5b89b8-rhgk9                    1/1     Running     0          10m
+otel-opentelemetry-collector-5b5b69557b-zqk5d   1/1     Running     0          19m
 ```
 
 ### Connecting to Your Cluster

diff --git a/deploy/helm/aws-login/values.yaml b/deploy/helm/aws-login/values.yaml
@@ -15,7 +15,7 @@ global:
   awsAccessKeyId: "Override"
   awsSecretAccessKey: "Override"
   pullSecretName: aws-login-credentials
-  cpuArch: "arm64"
+  cpuArch: "amd64"
 
 awsEcr:
   configName: aws-ecr-config

diff --git a/deploy/helm/thecombine/charts/maintenance/values.yaml b/deploy/helm/thecombine/charts/maintenance/values.yaml
@@ -26,7 +26,7 @@ global:
   imageRegistry: ""
   # Default AWS S3 location
   awsS3Location: "thecombine.app"
-  cpuArch: "arm64"
+  cpuArch: "amd64"
 
 imageName: combine_maint
 

diff --git a/deploy/scripts/app_release.py b/deploy/scripts/app_release.py
@@ -31,7 +31,7 @@ def get_release() -> str:
                 num_commits = match[2]
             # Get the branch name
             result = run_cmd(["git", "branch", "--show-current"], chomp=True)
-            branch_name = re.sub("[/_]+", "-", result.stdout)
+            branch_name = re.sub("[/_]+", "-", result.stdout) or "HEADLESS"
             return f"{release_string}-{branch_name}.{num_commits}"
     message = f"Unrecognized release value in tag: {result.stdout}"
     raise ValueError(message)