Skip to content

Commit

Permalink
Merge branch 'main' into feat/run-as-initcontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
hessjcg authored Nov 22, 2024
2 parents 9d27065 + 4f337e1 commit 768c10c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 39 deletions.
60 changes: 24 additions & 36 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,51 @@
{
"extends": [
"config:recommended",
":semanticCommitTypeAll(chore)",
":disableDependencyDashboard"
"config:recommended"
],
"ignorePresets": [
":semanticPrefixFixDepsChoreOthers"
],
"prConcurrentLimit": 0,
"rebaseWhen": "behind-base-branch",
"dependencyDashboard": true,
"dependencyDashboardLabels": ["type: process"],
"semanticCommits": "enabled",
"commitMessagePrefix": "deps: ",
"postUpdateOptions": [
"gomodTidy"
],
"prConcurrentLimit": 5,
"packageRules": [
{
"description": "Disable MAJOR update types",
"matchUpdateTypes": [
"major"
],
"enabled": false
},
{
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
"automerge": true,
"automergeType": "pr",
"automergeStrategy": "rebase"
},
{
"matchManagers": ["github-actions"],
"groupName": "Github action dependencies"
},
{
"matchPackagePatterns": [
"^cert-manager/cert-manager",
"^github.com/elastic/crd-ref-docs",
"^google",
"^google-beta",
"^hashicorp/terraform"
],
"groupName": "Build Tools"
},
{
"matchPackagePatterns": [
"^kubernetes",
"^k8s.io/client-go",
"^sigs.k8s.io/controller-runtime",
"^sigs.k8s.io/controller-tools"
],
"matchManagers": ["gomod"],
"groupName": "Kubernetes runtime dependencies"
},
{
"matchPackagePatterns": [
"^cert-manager/cert-manager",
"^github.com/elastic/crd-ref-docs",
"^google",
"^google-beta",
"^hashicorp/terraform"
],
"groupName": "Build Tools"
"matchManagers": ["dockerfile"],
"groupName": "Container image updates"
},
{
"groupName": "Go dependency updates",
"matchUpdateTypes": ["minor", "patch", "pin", "digest"]
},
{
"groupName": "Other dependency updates",
"matchUpdateTypes": ["minor", "patch", "pin", "digest"]
}
],
"force": {
"constraints": {
"go": "1.20"
}
},
"regexManagers": [
{
"customType": "regex",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot@sha256:8dd8d3ca2cf283383304fd45a5c9c74d5f2cd9da8d3b077d720e264880077c65
FROM gcr.io/distroless/static:nonroot@sha256:d71f4b239be2d412017b798a0a401c44c3049a3ca454838473a4c32ed076bfea

# For multi-arch builds, use automatic platform build arguments
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-operator
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot@sha256:8dd8d3ca2cf283383304fd45a5c9c74d5f2cd9da8d3b077d720e264880077c65
FROM gcr.io/distroless/static:nonroot@sha256:d71f4b239be2d412017b798a0a401c44c3049a3ca454838473a4c32ed076bfea

# For multi-arch builds, use automatic platform build arguments
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
Expand Down
2 changes: 1 addition & 1 deletion internal/workload/podspec_updates.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const (
// DefaultProxyImage is the latest version of the proxy as of the release
// of this operator. This is managed as a dependency. We update this constant
// when the Cloud SQL Auth Proxy releases a new version.
DefaultProxyImage = "gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.0"
DefaultProxyImage = "gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.1"

// DefaultFirstPort is the first port number chose for an instance listener by the
// proxy.
Expand Down

0 comments on commit 768c10c

Please sign in to comment.