Skip to content

Commit

Permalink
Release v0.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@roivaz
roivaz committed May 22, 2023
1 parent 18ac6ce commit c8f7359
Show file tree
Hide file tree
Showing 11 changed files with 357 additions and 141 deletions.
2 changes: 1 addition & 1 deletion 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.12.0-alpha.3
VERSION ?= 0.12.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
12 changes: 6 additions & 6 deletions bundle/manifests/marin3r.3scale.net_envoyconfigrevisions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,14 @@ spec:
the same namespace can be referred.
properties:
name:
description: Name of the envoy resource. If ref is not set,
a Secret with this same name will be fetched from within
the namespace.
description: Name of the envoy tslCerticate secret resource.
The certificate will be fetched from a Kubernetes Secrets
of type 'kubernetes.io/tls' with this same name.
type: string
ref:
description: Ref is a reference to a Kubernetes Secret of
type "kubernetes.io/tls". The value of 'ref' cannot point
to a different namespace.
description: 'DEPRECATED: this field is deprecated and it''s
value will be ignored. The ''name'' of the Kubernetes
Secret must match the ''name'' field.'
properties:
name:
description: name is unique within a namespace to reference
Expand Down
13 changes: 6 additions & 7 deletions bundle/manifests/marin3r.3scale.net_envoyconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,14 @@ spec:
the same namespace can be referred.
properties:
name:
description: Name of the envoy resource. If ref is not set,
a Secret with this same name will be fetched from within
the namespace.
description: Name of the envoy tslCerticate secret resource.
The certificate will be fetched from a Kubernetes Secrets
of type 'kubernetes.io/tls' with this same name.
type: string
ref:
description: Ref is a reference to a Kubernetes Secret of
type "kubernetes.io/tls". The value of 'ref' cannot point
to a different namespace.
description: 'DEPRECATED: this field is deprecated and it''s
value will be ignored. The ''name'' of the Kubernetes
Secret must match the ''name'' field.'
properties:
name:
description: name is unique within a namespace to reference
Expand Down Expand Up @@ -373,7 +373,6 @@ spec:
is used if unset.
enum:
- json
- b64json
- yaml
type: string
required:
Expand Down
194 changes: 154 additions & 40 deletions bundle/manifests/marin3r.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,133 @@ metadata:
"namespace": "my-namespace"
},
"spec": {
"envoyAPI": "v3",
"envoyResources": {
"clusters": [
{
"value": "name: example\nconnect_timeout: 10ms\ntype: STRICT_DNS\ndns_lookup_family: V4_ONLY\nlb_policy: ROUND_ROBIN\nload_assignment:\n cluster_name: example\n endpoints:\n - lb_endpoints:\n - endpoint:\n address:\n socket_address:\n address: example\n port_value: 8080\n"
}
],
"listeners": [
{
"value": "name: https\naddress:\n socket_address:\n address: 0.0.0.0\n port_value: 8443\nfilter_chains:\n - filters:\n - name: envoy.filters.network.http_connection_manager\n typed_config:\n \"@type\": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager\n access_log:\n - name: envoy.access_loggers.file\n typed_config:\n \"@type\": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog\n path: /dev/stdout\n stat_prefix: https\n rds: { route_config_name: \"local\", config_source: { ads: {}, resource_api_version: \"V3\" }}\n http_filters:\n - name: envoy.filters.http.router\n transport_socket:\n name: envoy.transport_sockets.tls\n typed_config:\n \"@type\": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext\n common_tls_context:\n tls_certificate_sds_secret_configs:\n - name: example.default.svc\n sds_config: { ads: {}, resource_api_version: \"V3\" }\n"
"nodeID": "example",
"resources": [
{
"type": "cluster",
"value": {
"connect_timeout": "0.01s",
"dns_lookup_family": "V4_ONLY",
"lb_policy": "ROUND_ROBIN",
"load_assignment": {
"cluster_name": "example",
"endpoints": [
{
"lb_endpoints": [
{
"endpoint": {
"address": {
"socket_address": {
"address": "example",
"port_value": 8080
}
}
}
}
]
}
]
},
"name": "example",
"type": "STRICT_DNS"
}
],
"routes": [
{
"value": "name: local\nvirtual_hosts:\n - name: all\n domains: [\"*\"]\n routes:\n - match:\n prefix: \"/\"\n route:\n cluster: example\n"
},
{
"type": "route",
"value": {
"name": "local",
"virtual_hosts": [
{
"domains": [
"*"
],
"name": "all",
"routes": [
{
"match": {
"prefix": "/"
},
"route": {
"cluster": "example"
}
}
]
}
]
}
],
"secrets": [
{
"name": "example.default.svc"
},
{
"type": "listener",
"value": {
"address": {
"socket_address": {
"address": "0.0.0.0",
"port_value": 8443
}
},
"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"
}
}
],
"http_filters": [
{
"name": "envoy.filters.http.router",
"typed_config": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
}
}
],
"rds": {
"config_source": {
"ads": {},
"resource_api_version": "V3"
},
"route_config_name": "local"
},
"stat_prefix": "https"
}
}
],
"transport_socket": {
"name": "envoy.transport_sockets.tls",
"typed_config": {
"@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
"common_tls_context": {
"tls_certificate_sds_secret_configs": [
{
"name": "example.default.svc",
"sds_config": {
"ads": {},
"resource_api_version": "V3"
}
}
]
}
}
}
}
],
"name": "https"
}
]
},
"nodeID": "example",
"serialization": "yaml"
},
{
"blueprint": "tlsCertificate",
"generateFromTlsSecret": "example.default.svc",
"type": "secret"
}
]
}
},
{
Expand Down Expand Up @@ -71,14 +173,14 @@ metadata:
categories: Networking
certified: "false"
containerImage: quay.io/3scale/marin3r
createdAt: "2023-05-10T14:02:27Z"
createdAt: "2023-05-22T14:59:28Z"
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.12.0-alpha.3
name: marin3r.v0.12.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -188,6 +290,13 @@ spec:
path: pkiConfg.serverCertificate.duration
- displayName: Secret Name
path: pkiConfg.serverCertificate.secretName
- description: PriorityClass to assign the discovery service Pod to
displayName: Pod Priority Class
path: podPriorityClass
- description: ProbePort is the port where healthz endpoint is served. Defaults
to 8384.
displayName: Probe Port
path: probePort
- description: Resources holds the Resource Requirements to use for the discovery
service Deployment. When not set it defaults to no resource requests nor
limits. CPU and Memory resources are supported.
Expand All @@ -205,11 +314,6 @@ spec:
to 18000.
displayName: Xds Server Port
path: xdsServerPort
statusDescriptors:
- description: Conditions represent the latest available observations of an
object's state
displayName: Conditions
path: conditions
version: v1alpha1
- description: EnvoyConfigRevision is an internal resource that stores a specific
version of an EnvoyConfig resource. EnvoyConfigRevisions are automatically
Expand Down Expand Up @@ -320,12 +424,13 @@ spec:
- description: Secrets is a list of references to Kubernetes Secret objects.
displayName: Secrets
path: envoyResources.secrets
- description: Name of the envoy resource. If ref is not set, a Secret with
this same name will be fetched from within the namespace.
- description: Name of the envoy tslCerticate secret resource. The certificate
will be fetched from a Kubernetes Secrets of type 'kubernetes.io/tls' with
this same name.
displayName: Name
path: envoyResources.secrets[0].name
- description: Ref is a reference to a Kubernetes Secret of type "kubernetes.io/tls".
The value of 'ref' cannot point to a different namespace.
- description: 'DEPRECATED: this field is deprecated and it''s value will be
ignored. The ''name'' of the Kubernetes Secret must match the ''name'' field.'
displayName: Ref
path: envoyResources.secrets[0].ref
x-descriptors:
Expand Down Expand Up @@ -501,12 +606,13 @@ spec:
- description: Secrets is a list of references to Kubernetes Secret objects.
displayName: Secrets
path: envoyResources.secrets
- description: Name of the envoy resource. If ref is not set, a Secret with
this same name will be fetched from within the namespace.
- description: Name of the envoy tslCerticate secret resource. The certificate
will be fetched from a Kubernetes Secrets of type 'kubernetes.io/tls' with
this same name.
displayName: Name
path: envoyResources.secrets[0].name
- description: Ref is a reference to a Kubernetes Secret of type "kubernetes.io/tls".
The value of 'ref' cannot point to a different namespace.
- description: 'DEPRECATED: this field is deprecated and it''s value will be
ignored. The ''name'' of the Kubernetes Secret must match the ''name'' field.'
displayName: Ref
path: envoyResources.secrets[0].ref
x-descriptors:
Expand Down Expand Up @@ -813,7 +919,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/3scale/marin3r:v0.12.0-alpha.3
image: quay.io/3scale/marin3r:v0.12.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -871,7 +977,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/3scale/marin3r:v0.12.0-alpha.3
image: quay.io/3scale/marin3r:v0.12.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -999,6 +1105,14 @@ spec:
- patch
- update
- watch
- apiGroups:
- discovery.k8s.io
resources:
- endpointslices
verbs:
- get
- list
- watch
- apiGroups:
- marin3r.3scale.net
resources:
Expand Down Expand Up @@ -1170,7 +1284,7 @@ spec:
maturity: alpha
provider:
name: Red Hat
version: 0.12.0-alpha.3
version: 0.12.0
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
Loading

0 comments on commit c8f7359

Please sign in to comment.