From f688206091b4eec345ea085d3286e977b394a65a Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Mon, 15 Apr 2024 17:09:43 +0200 Subject: [PATCH 1/6] wip: add documentation action --- .github/workflows/doc-helm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/doc-helm.yaml diff --git a/.github/workflows/doc-helm.yaml b/.github/workflows/doc-helm.yaml new file mode 100644 index 0000000..3ee4d25 --- /dev/null +++ b/.github/workflows/doc-helm.yaml @@ -0,0 +1,12 @@ +name: Generate Helm documentation +on: + - pull_request +jobs: + generate: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + - name: Run helm-docs + uses: losisin/helm-docs-github-action@v1 \ No newline at end of file From 8c2439541be9cfe030ec0dbfb176900fabe52ff6 Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Mon, 15 Apr 2024 17:11:56 +0200 Subject: [PATCH 2/6] wip: helm doc --- .github/workflows/doc-helm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/doc-helm.yaml b/.github/workflows/doc-helm.yaml index 3ee4d25..d97885b 100644 --- a/.github/workflows/doc-helm.yaml +++ b/.github/workflows/doc-helm.yaml @@ -9,4 +9,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.ref }} - name: Run helm-docs - uses: losisin/helm-docs-github-action@v1 \ No newline at end of file + uses: losisin/helm-docs-github-action@v1 + with: + git-push: true \ No newline at end of file From 055bf98a7d4c833864b2990e99c4484d01b50f17 Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Mon, 15 Apr 2024 17:17:30 +0200 Subject: [PATCH 3/6] wip: helm doc --- .github/workflows/doc-helm.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/doc-helm.yaml b/.github/workflows/doc-helm.yaml index d97885b..a168ea5 100644 --- a/.github/workflows/doc-helm.yaml +++ b/.github/workflows/doc-helm.yaml @@ -8,6 +8,27 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.ref }} + + - name: Get the rs-server version tag + id: get_version + shell: bash + run: | + # Enable pipefail so git command failures do not result in null versions downstream + set -x + + echo "RSSERVER_VERSION=$(\ + git ls-remote --tags --refs --sort="v:refname" \ + https://github.com/RS-PYTHON/rs-server.git 'v*.*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | cut -d '.' -f 1 \ + )" >> $GITHUB_OUTPUT + echo "SHA_SHORT=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT + + - name: Update version number in chart.yaml + shell: bash + run: | + for chart in $(find charts -name Chart.yaml); do + sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.RSSERVER_VERSION }}.0.0-${{ steps.get_version.outputs.SHA_SHORT }}," $chart + done + - name: Run helm-docs uses: losisin/helm-docs-github-action@v1 with: From 4661eed061c4b0d13ad077302096fabcd97bf26e Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Mon, 15 Apr 2024 17:18:43 +0200 Subject: [PATCH 4/6] wip: helm doc --- .github/workflows/doc-helm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/doc-helm.yaml b/.github/workflows/doc-helm.yaml index a168ea5..b0747e9 100644 --- a/.github/workflows/doc-helm.yaml +++ b/.github/workflows/doc-helm.yaml @@ -4,6 +4,7 @@ on: jobs: generate: runs-on: ubuntu-latest + permissions: write-all steps: - uses: actions/checkout@v4 with: From 343296862fb8c6422c1b7deddf432f262dd85d86 Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Mon, 15 Apr 2024 17:47:07 +0200 Subject: [PATCH 5/6] wip --- charts/mockup-station-adgs/values.yaml | 38 ++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/charts/mockup-station-adgs/values.yaml b/charts/mockup-station-adgs/values.yaml index 89d15ae..2854bf1 100644 --- a/charts/mockup-station-adgs/values.yaml +++ b/charts/mockup-station-adgs/values.yaml @@ -1,42 +1,76 @@ +# -- Namespace for the deployment namespace: processing +# -- Number of replicas for the deployment replicaCount: 1 +# -- Configuration for the service service: + # -- Port for the service port: 8080 +# -- Configuration for the application app: + # -- Port for the application port: 5000 + # -- Working directory for the application workDir: /app + # -- Config directory for the application confDir: /opt/adgs/config + # -- Auth file configuration for the application authConfigFile: auth.json +# -- Kubernetes probes configuration probe: + # -- Liveness probe configuration liveness: + # -- Path for the liveness probe path: /health + # -- Port for the liveness probe port: 5000 + # -- InitialDelaySeconds for the liveness probe initialDelaySeconds: 30 + # -- periodSeconds for the liveness probe periodSeconds: 30 + # -- timeoutSeconds for the liveness probe timeoutSeconds: 5 + # -- Readiness probe configuration readiness: + # -- Path for the readiness probe path: /health + # -- Port for the readiness probe port: 5000 + # -- InitialDelaySeconds for the readiness probe initialDelaySeconds: 30 + # -- periodSeconds for the readiness probe periodSeconds: 30 - timeoutSeconds: 5 + # -- timeoutSeconds for the readiness probe +# -- Image details image: + # -- Image registry registry: ghcr.io + # -- Image repository repository: rs-python + # -- Image name name: rs-testmeans_adgs-station-mock + # -- Image tag version tag: latest + # -- Image pull policy PullPolicy: Always #imagePullSecrets: regcred +# -- Pod resources details resources: - request: + # -- Pod request resources details + request: + # -- Pod memory request ram: "256Mi" + # -- Pod CPU request cpu: "100m" + # -- Pod limit resources details limit: + # -- Pod memory limit ram: "1000Mi" + # -- Pod CPU limit cpu: "500m" \ No newline at end of file From fc6fa504e027d7c0c6d0dcddba224afdfa368d0c Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Mon, 15 Apr 2024 17:49:35 +0200 Subject: [PATCH 6/6] wip --- charts/mockup-station-adgs/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/mockup-station-adgs/values.yaml b/charts/mockup-station-adgs/values.yaml index 2854bf1..683f05c 100644 --- a/charts/mockup-station-adgs/values.yaml +++ b/charts/mockup-station-adgs/values.yaml @@ -45,6 +45,7 @@ probe: # -- periodSeconds for the readiness probe periodSeconds: 30 # -- timeoutSeconds for the readiness probe + timeoutSeconds: 5 # -- Image details image: