diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9f9ca698..8dfbbf27 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 44c69424..9ae21e30 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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: | diff --git a/Dockerfile b/Dockerfile index 6e7be0ee..77b7fffa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index 21c10624..0da41664 100644 --- a/Makefile +++ b/Makefile @@ -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") diff --git a/bundle.Dockerfile b/bundle.Dockerfile index be6900b1..60bde73e 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,8 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=marin3r -LABEL operators.operatorframework.io.bundle.channels.v1=alpha,stable -LABEL operators.operatorframework.io.bundle.channel.default.v1=stable +LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/marin3r.clusterserviceversion.yaml b/bundle/manifests/marin3r.clusterserviceversion.yaml index 89ab80c3..5c3224b5 100644 --- a/bundle/manifests/marin3r.clusterserviceversion.yaml +++ b/bundle/manifests/marin3r.clusterserviceversion.yaml @@ -173,14 +173,14 @@ metadata: categories: Networking certified: "false" containerImage: quay.io/3scale/marin3r - createdAt: "2024-08-05T16:08:25Z" + createdAt: "2024-11-04T10:39:27Z" description: Lighweight, CRD based Envoy control plane for Kubernetes operators.operatorframework.io/builder: operator-sdk-v1.28.0 operators.operatorframework.io/internal-objects: '["envoyconfigrevisions.marin3r.3scale.net","discoveryservicecertificates.operator.marin3r.3scale.net"]' operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/3scale-ops/marin3r support: Red Hat, Inc. - name: marin3r.v0.13.1 + name: marin3r.v0.13.2-alpha.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -927,7 +927,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/3scale/marin3r:v0.13.1 + image: quay.io/3scale/marin3r:v0.13.2-alpha.1 livenessProbe: httpGet: path: /healthz @@ -985,7 +985,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/3scale/marin3r:v0.13.1 + image: quay.io/3scale/marin3r:v0.13.2-alpha.1 livenessProbe: httpGet: path: /healthz @@ -1292,7 +1292,7 @@ spec: maturity: alpha provider: name: Red Hat - version: 0.13.1 + version: 0.13.2-alpha.1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index dac1dc44..ae75f6eb 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,8 +4,7 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: marin3r - operators.operatorframework.io.bundle.channels.v1: alpha,stable - operators.operatorframework.io.bundle.channel.default.v1: stable + operators.operatorframework.io.bundle.channels.v1: alpha operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 725d2891..afa2da14 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -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 diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 542709f4..5fc79bef 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -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: diff --git a/examples/k8s/envoydeployment/v0.12.0/envoyconfig.yaml b/examples/k8s/envoydeployment/v0.12.0/envoyconfig.yaml index 4699a25e..ce49a141 100644 --- a/examples/k8s/envoydeployment/v0.12.0/envoyconfig.yaml +++ b/examples/k8s/envoydeployment/v0.12.0/envoyconfig.yaml @@ -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" @@ -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 diff --git a/examples/k8s/envoydeployment/v0.12.0/envoydeployment.yaml b/examples/k8s/envoydeployment/v0.12.0/envoydeployment.yaml index 1461b700..e4b028a7 100644 --- a/examples/k8s/envoydeployment/v0.12.0/envoydeployment.yaml +++ b/examples/k8s/envoydeployment/v0.12.0/envoydeployment.yaml @@ -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: diff --git a/generators/pkg-envoy-proto/go.mod b/generators/pkg-envoy-proto/go.mod index d49cc7a9..55e9a58d 100644 --- a/generators/pkg-envoy-proto/go.mod +++ b/generators/pkg-envoy-proto/go.mod @@ -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 diff --git a/generators/pkg-image/go.mod b/generators/pkg-image/go.mod index 828d91e1..037658b1 100644 --- a/generators/pkg-image/go.mod +++ b/generators/pkg-image/go.mod @@ -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 diff --git a/generators/pkg-version/go.mod b/generators/pkg-version/go.mod index 6b315ad7..19a04c78 100644 --- a/generators/pkg-version/go.mod +++ b/generators/pkg-version/go.mod @@ -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 diff --git a/go.mod b/go.mod index e17a6dc2..afd333ba 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/pkg/image/zz_generated.go b/pkg/image/zz_generated.go index 820e6a38..90726247 100644 --- a/pkg/image/zz_generated.go +++ b/pkg/image/zz_generated.go @@ -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" ) diff --git a/pkg/version/zz_generated.go b/pkg/version/zz_generated.go index 80cb3729..bb6288d7 100644 --- a/pkg/version/zz_generated.go +++ b/pkg/version/zz_generated.go @@ -1,5 +1,5 @@ package version const ( - version string = "v0.13.1" + version string = "v0.13.2-alpha.1" )