Skip to content

Commit

Permalink
Bump release
Browse files Browse the repository at this point in the history
Signed-off-by: Roi Vazquez <[email protected]>
  • Loading branch information
roivaz committed Nov 4, 2024
1 parent 66bde57 commit 046f343
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: "1.21.12"
go-version: "1.22.8"

- name: Build image
run: make docker-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: "1.21.12"
go-version: "1.22.8"

- name: Run tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.21.12 as builder
FROM golang:1.22.8 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.13.1
VERSION ?= 0.13.2-alpha.1

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down
3 changes: 1 addition & 2 deletions bundle.Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions bundle/manifests/marin3r.clusterserviceversion.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions bundle/metadata/annotations.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/3scale/marin3r
newTag: v0.13.1
newTag: v0.13.2-alpha.1

patchesStrategicMerge:
- custom/manager_patch.yaml
2 changes: 1 addition & 1 deletion config/webhook/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/3scale/marin3r
newTag: v0.13.1
newTag: v0.13.2-alpha.1

# [CUSTOM: pod mutating webhook config] This patch adds a label selector to the MutatingWebhookConfig
patchesStrategicMerge:
Expand Down
27 changes: 22 additions & 5 deletions examples/k8s/envoydeployment/v0.12.0/envoyconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,29 @@ spec:
socket_address:
address: 0.0.0.0
port_value: 8443
accessLog:
- name: envoy.access_loggers.file
typedConfig:
"@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
logFormat:
textFormatSource:
inlineString: |
[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %RESPONSE_CODE_DETAILS% %CONNECTION_TERMINATION_DETAILS% "%UPSTREAM_TRANSPORT_FAILURE_REASON%" %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" %UPSTREAM_CLUSTER% %UPSTREAM_LOCAL_ADDRESS% %DOWNSTREAM_LOCAL_ADDRESS% %DOWNSTREAM_REMOTE_ADDRESS% %REQUESTED_SERVER_NAME% %ROUTE_NAME%
path: /dev/stdout
filter_chains:
- filters:
- name: envoy.filters.network.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
access_log:
- name: envoy.access_loggers.file
typed_config:
"@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
path: /dev/stdout
# accessLog:
# - name: envoy.access_loggers.file
# typedConfig:
# "@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
# logFormat:
# textFormatSource:
# inlineString: |
# [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %RESPONSE_CODE_DETAILS% %CONNECTION_TERMINATION_DETAILS% "%UPSTREAM_TRANSPORT_FAILURE_REASON%" %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" %UPSTREAM_CLUSTER% %UPSTREAM_LOCAL_ADDRESS% %DOWNSTREAM_LOCAL_ADDRESS% %DOWNSTREAM_REMOTE_ADDRESS% %REQUESTED_SERVER_NAME% %ROUTE_NAME%
# path: /dev/stdout
stat_prefix: ingress_http
rds:
route_config_name: "kuard"
Expand All @@ -42,6 +55,10 @@ spec:
sds_config:
ads: {}
resource_api_version: "V3"
listenerFilters:
- name: envoy.filters.listener.tls_inspector
typedConfig:
"@type": type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
- type: secret
generateFromTlsSecret: kuard
- type: route
Expand Down
6 changes: 3 additions & 3 deletions examples/k8s/envoydeployment/v0.12.0/envoydeployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ spec:
ports:
- name: https
port: 8443
extraArgs:
- --component-log-level
- http:debug
# extraArgs:
# - --component-log-level
# - http:debug
adminAccessLogPath: /dev/stdout
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion generators/pkg-envoy-proto/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/3scale-ops/marin3r/generators/pkg-envoy-proto

go 1.20
go 1.22

require (
github.com/dave/jennifer v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion generators/pkg-image/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/3scale-ops/marin3r/generators/pkg-image

go 1.20
go 1.22

require (
github.com/dave/jennifer v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion generators/pkg-version/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/3scale-ops/marin3r/generators/pkg-version

go 1.20
go 1.22

require (
github.com/dave/jennifer v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/3scale-ops/marin3r

go 1.21
go 1.22

require (
github.com/3scale-ops/basereconciler v0.5.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/image/zz_generated.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package image

const (
image string = "quay.io/3scale/marin3r:v0.13.1"
image string = "quay.io/3scale/marin3r:v0.13.2-alpha.1"
)
2 changes: 1 addition & 1 deletion pkg/version/zz_generated.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package version

const (
version string = "v0.13.1"
version string = "v0.13.2-alpha.1"
)

0 comments on commit 046f343

Please sign in to comment.