Skip to content

Commit

Permalink
Merge pull request #158 from 3scale-ops/release/0.11.0
Browse files Browse the repository at this point in the history 
release/0.11.0
  • Loading branch information
@3scale-robot
3scale-robot committed Nov 4, 2022
2 parents c6a6fe7 + ace1373 commit ea82619
Show file tree
Hide file tree
Showing 19 changed files with 387 additions and 91 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
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.10.0
VERSION ?= 0.11.0

# 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 Expand Up @@ -244,7 +244,7 @@ $(GOCOVMERGE):

.PHONY: crd-ref-docs
crd-ref-docs: ## Download crd-ref-docs locally if necessary
test -s $(GOCOVMERGE) || GOBIN=$(LOCALBIN) go install github.com/elastic/crd-ref-docs@$(CRD_REFDOCS_VERSION)
test -s $(CRD_REFDOCS) || GOBIN=$(LOCALBIN) go install github.com/elastic/crd-ref-docs@$(CRD_REFDOCS_VERSION)

.PHONY: kind
KIND = $(shell pwd)/bin/kind
Expand Down Expand Up @@ -365,7 +365,7 @@ catalog-retag-latest:
tmp/certs:
hack/gen-certs.sh

ENVOY_VERSION ?= v1.20.1
ENVOY_VERSION ?= v1.23.2

run-ds: ## locally starts a discovery service
run-ds: manifests generate fmt vet go-generate tmp/certs
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ spec:
# API V3 reference: https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/runtime/v3/rtds.proto
runtimes:
- value: {"name":"runtime1","layer":{"static_layer_0":"value"}}
# ExtensionConfigs is a list of the envoy ExtensionConfig resource type
# API V3 reference: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/extension.proto
extensionConfigs:
- value: {"name":"http_filter1","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router","dynamic_stats":false}}
```

### **Secrets**
Expand Down
3 changes: 2 additions & 1 deletion bundle.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ 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
LABEL operators.operatorframework.io.bundle.channels.v1=alpha,stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
Expand Down
73 changes: 61 additions & 12 deletions bundle/manifests/marin3r.3scale.net_envoyconfigrevisions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -100,14 +104,41 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- value
type: object
type: array
extensionConfigs:
description: 'ExtensionConfigs is a list of the envoy ExtensionConfig
resource type API V3 reference: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/extension.proto'
items:
description: EnvoyResource holds serialized representation of
an envoy resource
properties:
name:
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -119,14 +150,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -138,14 +173,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -157,14 +196,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -176,14 +219,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand Down Expand Up @@ -299,6 +346,8 @@ spec:
type: string
endpoints:
type: string
extensionConfigs:
type: string
listeners:
type: string
routes:
Expand Down
71 changes: 59 additions & 12 deletions bundle/manifests/marin3r.3scale.net_envoyconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -92,14 +96,41 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- value
type: object
type: array
extensionConfigs:
description: 'ExtensionConfigs is a list of the envoy ExtensionConfig
resource type API V3 reference: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/extension.proto'
items:
description: EnvoyResource holds serialized representation of
an envoy resource
properties:
name:
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -111,14 +142,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -130,14 +165,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -149,14 +188,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand All @@ -168,14 +211,18 @@ spec:
an envoy resource
properties:
name:
description: Name of the envoy resource
description: 'Name of the envoy resource. DEPRECATED: this
field has no effect and will be removed in an upcoming
release. The name of the resources for discovery purposes
is included in the resource itself. Refer to the envoy
API reference to check how the name is specified for each
resource type.'
type: string
value:
description: Value is the serialized representation of the
envoy resource
type: string
required:
- name
- value
type: object
type: array
Expand Down
Loading

0 comments on commit ea82619

Please sign in to comment.