Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2396 Switch to large hosted runners for helm enterprise #1045

Merged
merged 22 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/helm-community.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ concurrency:
cancel-in-progress: true
jobs:
community_charts:
runs-on: [self-hosted]
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4

Expand All @@ -39,8 +40,6 @@ jobs:
uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
with:
ingress-nginx-ref: controller-v1.8.2
kind-version: v0.19.0
kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b

- name: Set nginx ingress config
run: |
Expand All @@ -61,7 +60,7 @@ jobs:
--set global.search.sharedSecret="$(openssl rand -hex 24)" \
--set global.known_urls=http://localhost \
--set global.alfrescoRegistryPullSecrets=regcred \
--wait --timeout 15m0s --values \
--wait --timeout 5m0s --values \
test/community-integration-test-values.yaml

- name: Spit cluster status
Expand Down
21 changes: 15 additions & 6 deletions .github/workflows/helm-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ jobs:
echo "json=$CHARTS" >> $GITHUB_OUTPUT

helm_integration:
runs-on: [self-hosted]
runs-on: alfrescoPub-ubuntu2204-16G-4CPU
timeout-minutes: 10
needs:
- build_vars
name: Helm ${{ matrix.name }} ${{ matrix.values }}
Expand Down Expand Up @@ -89,8 +90,6 @@ jobs:
uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
with:
ingress-nginx-ref: controller-v1.8.2
kind-version: v0.19.0
kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b

- name: Set nginx ingress config
run: |
Expand All @@ -103,16 +102,26 @@ jobs:
--from-file=.dockerconfigjson=$HOME/.docker/config.json \
--type=kubernetes.io/dockerconfigjson

- name: Check if cgroup v2 workaround is needed
id: extra-values
run: |
acs_version=$(echo ${{ matrix.values }} | cut -d'.' -f1,2)
is_affected=$(echo "$acs_version <= 7.2" | bc -l)
if [ "$is_affected" -eq 1 ]; then
echo "helm_install_params=--values test/cgroup-v2-workaround-values.yaml" >> "$GITHUB_OUTPUT"
fi

- name: Helm install
run: |
helm dep up ./helm/alfresco-content-services
helm install acs ./helm/alfresco-content-services \
--set global.search.sharedSecret="$(openssl rand -hex 24)" \
--set global.known_urls=http://localhost \
--set global.alfrescoRegistryPullSecrets=regcred \
--wait --timeout 15m0s \
--wait --timeout 6m0s \
--values helm/${{ matrix.name }}/${{ matrix.values }} \
--values test/enterprise-integration-test-values.yaml
--values test/enterprise-integration-test-values.yaml \
${{ steps.extra-values.outputs.helm_install_params }}

- name: Spit cluster status after install
if: always()
Expand All @@ -125,7 +134,7 @@ jobs:
id: newman
with:
timeout_minutes: 1
retry_wait_seconds: 30
retry_wait_seconds: 20
max_attempts: 5
command: >-
docker run --network=host
Expand Down
42 changes: 42 additions & 0 deletions test/cgroup-v2-workaround-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
alfresco-repository:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=2147483648
share:
environment:
CATALINA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=536870912
alfresco-transform-service:
pdfrenderer:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=536870912
imagemagick:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=536870912
libreoffice:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=1073741824
tika:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=536870912
transformmisc:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=536870912
transformrouter:
environment:
JAVA_OPTS: >-
-XX:MaxRAMPercentage=80
-XX:MaxRAM=838860800
2 changes: 1 addition & 1 deletion test/enterprise-integration-test-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ alfresco-repository:
memory: "1024Mi"
limits:
cpu: "2"
memory: "1560Mi"
memory: "2Gi"
replicaCount: 2
persistence:
accessModes:
Expand Down
Loading