diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6750e84..9b44fa4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -36,27 +36,27 @@ jobs: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - name: Get app version from chart - uses: mikefarah/yq@v4.34.1 + uses: mikefarah/yq@v4.35.1 id: app_version with: cmd: yq '.appVersion' charts/bitwarden-crd-operator/Chart.yaml - name: "GHCR Login" - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: lerentis password: ${{ secrets.GITHUB_TOKEN }} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: "GHCR Build and Push" id: docker_build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/test-and-lint.yml b/.github/workflows/test-and-lint.yml index 5bacf55..4759da9 100644 --- a/.github/workflows/test-and-lint.yml +++ b/.github/workflows/test-and-lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -40,14 +40,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: "GHCR Build" id: docker_build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: push: false platforms: linux/amd64,linux/arm64 diff --git a/Dockerfile b/Dockerfile index 0df6dbf..55488ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM alpine:3.18.0 +FROM alpine:3.18.3 LABEL org.opencontainers.image.source=https://github.com/Lerentis/bitwarden-crd-operator LABEL org.opencontainers.image.description="Kubernetes Operator to create k8s secrets from bitwarden" LABEL org.opencontainers.image.licenses=MIT -ARG PYTHON_VERSION=3.11.4-r0 +ARG PYTHON_VERSION=3.11.5-r0 ARG PIP_VERSION=23.1.2-r0 ARG GCOMPAT_VERSION=1.1.0-r1 -ARG LIBCRYPTO_VERSION=3.1.0-r4 -ARG BW_VERSION=2023.1.0 +ARG LIBCRYPTO_VERSION=3.1.2-r0 +ARG BW_VERSION=2023.7.0 COPY requirements.txt /requirements.txt diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index 9fee9d9..0100424 100644 --- a/charts/bitwarden-crd-operator/Chart.yaml +++ b/charts/bitwarden-crd-operator/Chart.yaml @@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator type: application -version: "v0.7.4" +version: "v0.7.6" -appVersion: "0.6.4" +appVersion: "0.6.5" keywords: - operator @@ -95,8 +95,14 @@ annotations: artifacthub.io/operator: "true" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - - kind: fixed - description: "Fixed bitwarden installation" + - kind: changed + description: "Updated alpine to 3.18.3" + - kind: changed + description: "Updated python to 3.11.5-r0" + - kind: changed + description: "Updated libcrypto3 to 3.1.2-r0" + - kind: changed + description: "Updated bitwarden cli to v2023.7.0" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.4 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.5 diff --git a/charts/bitwarden-crd-operator/templates/deployment.yaml b/charts/bitwarden-crd-operator/templates/deployment.yaml index 931f3fa..707aec6 100644 --- a/charts/bitwarden-crd-operator/templates/deployment.yaml +++ b/charts/bitwarden-crd-operator/templates/deployment.yaml @@ -50,10 +50,20 @@ spec: httpGet: path: /healthz port: http + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} readinessProbe: httpGet: path: /healthz port: http + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/bitwarden-crd-operator/values.yaml b/charts/bitwarden-crd-operator/values.yaml index 5a3aa6e..a293c41 100644 --- a/charts/bitwarden-crd-operator/values.yaml +++ b/charts/bitwarden-crd-operator/values.yaml @@ -51,6 +51,20 @@ securityContext: {} # runAsNonRoot: true # runAsUser: 1000 +readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + +livenessProbe: + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little diff --git a/requirements.txt b/requirements.txt index 381a485..ae32d3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -kopf==1.36.1 +kopf==1.36.2 kubernetes==26.1.0 Jinja2==3.1.2