Skip to content

Commit

Permalink
Merge branch 'main' into renovate/golang-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jschoone authored Dec 2, 2024
2 parents 158d6e9 + 9fe0282 commit 3e99d52
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on: # yamllint disable-line rule:truthy
- ".github/workflows/pr-*"
- "!**/vendor/**"
- docs/**
- README.md

# yamllint disable rule:line-length
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-update-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "$GITHUB_ENV"
- name: Renovate
uses: renovatebot/github-action@630a255a1f2f56c8d8ce160bed3e3ca577ca53e2 # v40.2.7
uses: renovatebot/github-action@936628dfbff213ab2eb95033c5e123cfcaf09ebb # v41.0.5
env:
RENOVATE_HOST_RULES: '[{"hostType": "docker", "matchHost": "ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '[".*"]'
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![GitHub Latest Release](https://img.shields.io/github/v/release/SovereignCloudStack/cluster-stack-provider-openstack?logo=github)](https://github.com/SovereignCloudStack/cluster-stack-provider-openstack/releases)
[![Go Report Card](https://goreportcard.com/badge/github.com/SovereignCloudStack/cluster-stack-provider-openstack)](https://goreportcard.com/report/github.com/SovereignCloudStack/cluster-stack-provider-openstack)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/license/apache-2-0/)

## Overview

Expand All @@ -24,11 +24,11 @@ Explore the documentation stored in the [docs](./docs) directory or view the ren

| | CSO `v0.1.0-alpha.2` | CSO `v0.1.0-alpha.3` | CSO `v0.1.0-alpha.5` | CSO `v0.1.0-alpha.6` |
| ----------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
| CSPO `v0.1.0-alpha.rc1` || | | |
| CSPO `v0.1.0-alpha.1` |||||
| CSPO `v0.1.0-alpha.2` |||||
| CSPO `v0.1.0-alpha.3` |||||
| CSPO `v0.1.0-alpha.4` |||||
| CSPO `v0.1.0-alpha.rc1` | | | | |
| CSPO `v0.1.0-alpha.1` | | | | |
| CSPO `v0.1.0-alpha.2` | | | | |
| CSPO `v0.1.0-alpha.3` | | | | |
| CSPO `v0.1.0-alpha.4` | | | | |

## Controllers

Expand Down
4 changes: 2 additions & 2 deletions images/cache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.


FROM docker.io/library/alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as import-cache
FROM docker.io/library/alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a as import-cache

RUN --mount=type=bind,target=/host-tmp \
--mount=type=cache,target=/root/.cache \
Expand All @@ -27,7 +27,7 @@ RUN --mount=type=bind,target=/host-tmp \
tar xzf /host-tmp/go-pkg-cache.tar.gz --no-same-owner -C /go/pkg; \
fi

FROM docker.io/library/alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as cache-creator
FROM docker.io/library/alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a as cache-creator
RUN --mount=type=cache,target=/root/.cache \
--mount=type=cache,target=/go/pkg \
tar czf /tmp/go-build-cache.tar.gz -C /root/.cache/go-build . ; \
Expand Down
2 changes: 1 addition & 1 deletion images/cspo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build the manager binary
FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.23.0-bullseye as build
FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.23.3-bullseye as build
ARG TARGETOS TARGETARCH

COPY . /src/cluster-stack-provider-openstack
Expand Down

0 comments on commit 3e99d52

Please sign in to comment.