Skip to content

Commit

Permalink
Increase the init container (busybox) memory limit (#369)
Browse files Browse the repository at this point in the history
Co-authored-by: Giovanni Toraldo <[email protected]>
  • Loading branch information
toliger and gionn authored Sep 23, 2024
1 parent bf048ce commit 8788884
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 25 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
KIND_NODE_IMAGE: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
TEST_ALL_CHARTS: ${{ contains(github.event.pull_request.labels.*.name, 'ci-test-all') && 'true' || 'false' }}
TEST_ALL_CHARTS_ARG: ${{ contains(github.event.pull_request.labels.*.name, 'ci-test-all') && '--all' || '' }}
PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
steps:
- name: Checkout
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
Expand Down Expand Up @@ -62,37 +63,37 @@ jobs:

- name: Create kind cluster
uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced # v1.9.0
if: steps.list-changed.outputs.changed == 'true' && env.PR_FROM_FORK == 'false'
with:
version: ${{ env.KIND_VERSION}}
node_image: ${{ env.KIND_NODE_IMAGE }}
if: steps.list-changed.outputs.changed == 'true'

- name: Login to Quay.io
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
if: steps.list-changed.outputs.changed == 'true'
if: steps.list-changed.outputs.changed == 'true' && env.PR_FROM_FORK == 'false'
with:
registry: quay.io
username: ${{ secrets.quay_username }}
password: ${{ secrets.quay_password }}

- name: Get Activiti License from S3
if: steps.list-changed.outputs.changed == 'true'
if: steps.list-changed.outputs.changed == 'true' && env.PR_FROM_FORK == 'false'
env:
AWS_REGION: us-east-1
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_S3_ACSLICENSE_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_S3_ACSLICENSE_SECRET_ACCESS_KEY }}
run: aws s3 cp s3://aps-licenses/single-tenant/activiti.lic /tmp/activiti.lic

- name: Prepare namespace for install
if: steps.list-changed.outputs.changed == 'true'
if: steps.list-changed.outputs.changed == 'true' && env.PR_FROM_FORK == 'false'
run: |
kubectl create ns "$INSTALL_NAMESPACE"
kubectl create secret generic quay-registry-secret --from-file=.dockerconfigjson="${HOME}"/.docker/config.json --type=kubernetes.io/dockerconfigjson -n "$INSTALL_NAMESPACE"
kubectl create secret generic broker-secret --from-literal=BROKER_URL="failover:(nio://activemq:61616)?timeout=3000" --from-literal=BROKER_USERNAME=admin --from-literal=BROKER_PASSWORD=admin -n "$INSTALL_NAMESPACE"
kubectl create secret generic aps-license --from-file=activiti.lic=/tmp/activiti.lic -n "$INSTALL_NAMESPACE"
- name: Prepare charts mocks for testing
if: steps.list-changed.outputs.changed == 'true'
if: steps.list-changed.outputs.changed == 'true' && env.PR_FROM_FORK == 'false'
run: |
ITER_CMD="ct lsc --config ct.yaml"
if [[ "$TEST_ALL_CHARTS" == "true" ]]; then
Expand All @@ -109,6 +110,7 @@ jobs:
done
- name: Run chart-testing (install)
if: steps.list-changed.outputs.changed == 'true' && env.PR_FROM_FORK == 'false'
run: >-
ct install --config ct.yaml
--namespace "$INSTALL_NAMESPACE"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ jobs:
- name: Run pre-commit
uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@a288b9efdaa50413573b2e130896d906478b8e50 # v5.31.0
with:
auto-commit: "true"
# disable auto-commit for PRs from forks
auto-commit: ${{ github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork }}
2 changes: 1 addition & 1 deletion charts/alfresco-connector-hxi/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: alfresco-connector-hxi
description: A Helm chart for deploying Alfresco connector hxi services
type: application
version: 0.1.0-alpha.0
version: 0.1.0-alpha.1
appVersion: 1.0.0
dependencies:
- name: alfresco-common
Expand Down
4 changes: 2 additions & 2 deletions charts/alfresco-connector-hxi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parent: Charts Reference

# alfresco-connector-hxi

![Version: 0.1.0-alpha.0](https://img.shields.io/badge/Version-0.1.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
![Version: 0.1.0-alpha.1](https://img.shields.io/badge/Version-0.1.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)

A Helm chart for deploying Alfresco connector hxi services

Expand Down Expand Up @@ -35,7 +35,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
| bulkIngester.image.repository | string | `"quay.io/alfresco/alfresco-hxinsight-connector-bulk-ingester"` | |
| bulkIngester.image.tag | string | `"1.0.0-A13"` | |
| bulkIngester.initContainers.waitForRepository.resources.limits.cpu | string | `"0.25"` | |
| bulkIngester.initContainers.waitForRepository.resources.limits.memory | string | `"10Mi"` | |
| bulkIngester.initContainers.waitForRepository.resources.limits.memory | string | `"20Mi"` | |
| bulkIngester.resources.limits.cpu | string | `"2"` | |
| bulkIngester.resources.limits.memory | string | `"512Mi"` | |
| bulkIngester.resources.requests.cpu | string | `"0.5"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-connector-hxi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ bulkIngester:
resources:
limits:
cpu: "0.25"
memory: "10Mi"
memory: "20Mi"
affinity: {}
predictionApplier:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-repository/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: alfresco-repository
description: Alfresco content repository Helm chart
type: application
version: 0.7.0
version: 0.7.1
appVersion: 23.3.0
dependencies:
- name: alfresco-common
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-repository/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parent: Charts Reference

# alfresco-repository

![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.3.0](https://img.shields.io/badge/AppVersion-23.3.0-informational?style=flat-square)
![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.3.0](https://img.shields.io/badge/AppVersion-23.3.0-informational?style=flat-square)

Alfresco content repository Helm chart

Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-repository/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
resources:
limits:
cpu: "0.25"
memory: "10Mi"
memory: "20Mi"
env:
{{ include "alfresco-repository.db.env" . | indent 12 }}
command:
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-search-enterprise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v2
name: alfresco-search-enterprise
description: A Helm chart for deploying Alfresco Elasticsearch connector
type: application
version: 4.0.0
version: 4.0.1
appVersion: 4.1.0
dependencies:
- name: alfresco-common
Expand Down
4 changes: 2 additions & 2 deletions charts/alfresco-search-enterprise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parent: Charts Reference

# alfresco-search-enterprise

![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)
![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)

A Helm chart for deploying Alfresco Elasticsearch connector

Expand Down Expand Up @@ -79,7 +79,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
| reindexing.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-reindexing"` | |
| reindexing.image.tag | string | `"4.1.0"` | |
| reindexing.initcontainers.waitForRepository.resources.limits.cpu | string | `"0.25"` | |
| reindexing.initcontainers.waitForRepository.resources.limits.memory | string | `"10Mi"` | |
| reindexing.initcontainers.waitForRepository.resources.limits.memory | string | `"20Mi"` | |
| reindexing.pathIndexingEnabled | bool | `true` | |
| reindexing.repository.existingConfigMap.keys.url | string | `"REPOSITORY_URL"` | Key within the configmap holding the full url to connect to the alfresco repository |
| reindexing.repository.existingConfigMap.name | string | `nil` | Alternatively, provide repository connection details via an existing configmap |
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-search-enterprise/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ reindexing:
resources:
limits:
cpu: "0.25"
memory: "10Mi"
memory: "20Mi"
serviceAccount:
# Specifies whether a service account should be created
create: true
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-search-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords:
name: alfresco-search-service
sources:
- https://github.com/Alfresco/alfresco-helm-charts
version: 3.3.2
version: 3.3.3
appVersion: 2.0.11
dependencies:
- name: alfresco-insight-zeppelin
Expand Down
4 changes: 2 additions & 2 deletions charts/alfresco-search-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parent: Charts Reference

# alfresco-search-service

![Version: 3.3.2](https://img.shields.io/badge/Version-3.3.2-informational?style=flat-square) ![AppVersion: 2.0.11](https://img.shields.io/badge/AppVersion-2.0.11-informational?style=flat-square)
![Version: 3.3.3](https://img.shields.io/badge/Version-3.3.3-informational?style=flat-square) ![AppVersion: 2.0.11](https://img.shields.io/badge/AppVersion-2.0.11-informational?style=flat-square)

A Helm chart for deploying Alfresco Search Service

Expand Down Expand Up @@ -42,7 +42,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
| initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
| initContainer.image.repository | string | `"busybox"` | |
| initContainer.image.tag | string | `"1.35.0"` | |
| initContainer.resources.limits.memory | string | `"10Mi"` | |
| initContainer.resources.limits.memory | string | `"20Mi"` | |
| initContainer.resources.requests.memory | string | `"5Mi"` | |
| insightEngineImage.internalPort | string | `nil` | container's port search service is listening on change if your custom image use a different port. |
| insightEngineImage.pullPolicy | string | `"IfNotPresent"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-search-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ initContainer:
requests:
memory: "5Mi"
limits:
memory: "10Mi"
memory: "20Mi"
global:
alfrescoRegistryPullSecrets: quay-registry-secret
nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-transform-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: alfresco-transform-service
description: A Helm chart for deploying Alfresco Transform Services
type: application
version: 2.1.0
version: 2.1.1
appVersion: 4.1.4
dependencies:
- name: alfresco-common
Expand Down
4 changes: 2 additions & 2 deletions charts/alfresco-transform-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parent: Charts Reference

# alfresco-transform-service

![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.4](https://img.shields.io/badge/AppVersion-4.1.4-informational?style=flat-square)
![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.4](https://img.shields.io/badge/AppVersion-4.1.4-informational?style=flat-square)

A Helm chart for deploying Alfresco Transform Services

Expand Down Expand Up @@ -37,7 +37,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
| filestore.initContainer.image.repository | string | `"busybox"` | |
| filestore.initContainer.image.tag | string | `"1.35.0"` | |
| filestore.initContainer.resources.limits.cpu | string | `"0.50"` | |
| filestore.initContainer.resources.limits.memory | string | `"10Mi"` | |
| filestore.initContainer.resources.limits.memory | string | `"20Mi"` | |
| filestore.livenessProbe.initialDelaySeconds | int | `10` | |
| filestore.livenessProbe.path | string | `"/live"` | |
| filestore.livenessProbe.periodSeconds | int | `20` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-transform-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ filestore:
resources:
limits:
cpu: "0.50"
memory: "10Mi"
memory: "20Mi"
service:
name: filestore
type: ClusterIP
Expand Down

0 comments on commit 8788884

Please sign in to comment.