diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f2d7d7..66be289 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Lint Helm chart uses: WyriHaximus/github-action-helm3@v2.1.3 with: - exec: helm lint ./helm/charts/scheduled-volume-snapshotter --strict + exec: helm lint ./helm/charts/scheduled-volume-snapshotter - name: Lint Python with flake8 run: | pip install flake8 diff --git a/Dockerfile b/Dockerfile index bc69bc8..4fccb64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,11 @@ COPY snapshotter.py . COPY requirements.txt . RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ - && pip install --no-cache-dir --upgrade pip==23.3 setuptools==67.1.0 \ - && pip install --no-cache-dir -r requirements.txt \ - && rm requirements.txt + && apt-get upgrade -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && pip install --no-cache-dir --upgrade pip==23.3 setuptools==70.0.0 \ + && pip install --no-cache-dir -r requirements.txt \ + && rm requirements.txt ENTRYPOINT ["python", "-u", "snapshotter.py"] diff --git a/helm/charts/scheduled-volume-snapshotter/templates/cronjob.yaml b/helm/charts/scheduled-volume-snapshotter/templates/cronjob.yaml index 839f3b8..0aed4b1 100644 --- a/helm/charts/scheduled-volume-snapshotter/templates/cronjob.yaml +++ b/helm/charts/scheduled-volume-snapshotter/templates/cronjob.yaml @@ -1,4 +1,4 @@ -{{- if or .Values.useArgoCD .Capabilities.APIVersions.Has "batch/v1/CronJob" -}} +{{- if or .Values.useArgoCD (.Capabilities.APIVersions.Has "batch/v1/CronJob") -}} apiVersion: batch/v1 {{- else }} apiVersion: batch/v1beta1