diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
index f2b8397930..f03c0e2ce7 100644
--- a/apis/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/v1alpha1/zz_generated.deepcopy.go
@@ -22,6 +22,7 @@ package v1alpha1
import (
"k8s.io/api/autoscaling/v2"
"k8s.io/api/core/v1"
+ networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/runtime"
)
@@ -33,6 +34,11 @@ func (in *AutoscalerSpec) DeepCopyInto(out *AutoscalerSpec) {
*out = new(v2.HorizontalPodAutoscalerBehavior)
(*in).DeepCopyInto(*out)
}
+ if in.TargetCPUUtilization != nil {
+ in, out := &in.TargetCPUUtilization, &out.TargetCPUUtilization
+ *out = new(int32)
+ **out = **in
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerSpec.
@@ -82,6 +88,35 @@ func (in *Exporter) DeepCopy() *Exporter {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Ingress) DeepCopyInto(out *Ingress) {
+ *out = *in
+ if in.Annotations != nil {
+ in, out := &in.Annotations, &out.Annotations
+ *out = make(map[string]string, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
+ if in.TLS != nil {
+ in, out := &in.TLS, &out.TLS
+ *out = make([]networkingv1.IngressTLS, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Ingress.
+func (in *Ingress) DeepCopy() *Ingress {
+ if in == nil {
+ return nil
+ }
+ out := new(Ingress)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Instrumentation) DeepCopyInto(out *Instrumentation) {
*out = *in
@@ -398,6 +433,7 @@ func (in *OpenTelemetryCollectorSpec) DeepCopyInto(out *OpenTelemetryCollectorSp
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
+ in.Ingress.DeepCopyInto(&out.Ingress)
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenTelemetryCollectorSpec.
@@ -434,12 +470,12 @@ func (in *OpenTelemetryCollectorStatus) DeepCopy() *OpenTelemetryCollectorStatus
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *OpenTelemetryTargetAllocator) DeepCopyInto(out *OpenTelemetryTargetAllocator) {
*out = *in
- out.PrometheusCR = in.PrometheusCR
if in.Replicas != nil {
in, out := &in.Replicas, &out.Replicas
*out = new(int32)
**out = **in
}
+ out.PrometheusCR = in.PrometheusCR
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenTelemetryTargetAllocator.
diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
index fb2be6e9b1..c8debce019 100644
--- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -209,6 +209,18 @@ spec:
- get
- list
- update
+ - apiGroups:
+ - networking.k8s.io
+ resources:
+ - ingresses
+ verbs:
+ - create
+ - delete
+ - get
+ - list
+ - patch
+ - update
+ - watch
- apiGroups:
- opentelemetry.io
resources:
diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
index d9efcacdde..7463649d07 100644
--- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -354,6 +354,51 @@ spec:
description: ImagePullPolicy indicates the pull policy to be used
for retrieving the container image (Always, Never, IfNotPresent)
type: string
+ ingress:
+ description: 'Ingress is used to specify how OpenTelemetry Collector
+ is exposed. This functionality is only available if one of the valid
+ modes is set. Valid modes are: deployment, daemonset and statefulset.'
+ properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: 'Annotations to add to ingress. e.g. ''cert-manager.io/cluster-issuer:
+ "letsencrypt"'''
+ type: object
+ hostname:
+ description: Hostname by which the ingress proxy can be reached.
+ type: string
+ tls:
+ description: TLS configuration.
+ items:
+ description: IngressTLS describes the transport layer security
+ associated with an Ingress.
+ properties:
+ hosts:
+ description: Hosts are a list of hosts included in the TLS
+ certificate. The values in this list must match the name/s
+ used in the tlsSecret. Defaults to the wildcard host setting
+ for the loadbalancer controller fulfilling this Ingress,
+ if left unspecified.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ secretName:
+ description: SecretName is the name of the secret used to
+ terminate TLS traffic on port 443. Field is left optional
+ to allow TLS routing based on SNI hostname alone. If the
+ SNI host in a listener conflicts with the "Host" header
+ field used by an IngressRule, the SNI host is used for
+ termination and value of the Host header is used for routing.
+ type: string
+ type: object
+ type: array
+ type:
+ description: 'Type default value is: none Supported types are:
+ ingress'
+ type: string
+ type: object
maxReplicas:
description: MaxReplicas sets an upper bound to the autoscaling feature.
If MaxReplicas is set autoscaling is enabled.
diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
index 16a0124882..1cd08c97e0 100644
--- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -352,6 +352,51 @@ spec:
description: ImagePullPolicy indicates the pull policy to be used
for retrieving the container image (Always, Never, IfNotPresent)
type: string
+ ingress:
+ description: 'Ingress is used to specify how OpenTelemetry Collector
+ is exposed. This functionality is only available if one of the valid
+ modes is set. Valid modes are: deployment, daemonset and statefulset.'
+ properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: 'Annotations to add to ingress. e.g. ''cert-manager.io/cluster-issuer:
+ "letsencrypt"'''
+ type: object
+ hostname:
+ description: Hostname by which the ingress proxy can be reached.
+ type: string
+ tls:
+ description: TLS configuration.
+ items:
+ description: IngressTLS describes the transport layer security
+ associated with an Ingress.
+ properties:
+ hosts:
+ description: Hosts are a list of hosts included in the TLS
+ certificate. The values in this list must match the name/s
+ used in the tlsSecret. Defaults to the wildcard host setting
+ for the loadbalancer controller fulfilling this Ingress,
+ if left unspecified.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ secretName:
+ description: SecretName is the name of the secret used to
+ terminate TLS traffic on port 443. Field is left optional
+ to allow TLS routing based on SNI hostname alone. If the
+ SNI host in a listener conflicts with the "Host" header
+ field used by an IngressRule, the SNI host is used for
+ termination and value of the Host header is used for routing.
+ type: string
+ type: object
+ type: array
+ type:
+ description: 'Type default value is: none Supported types are:
+ ingress'
+ type: string
+ type: object
maxReplicas:
description: MaxReplicas sets an upper bound to the autoscaling feature.
If MaxReplicas is set autoscaling is enabled.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index a321ff7891..5655552356 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -120,6 +120,18 @@ rules:
- get
- list
- update
+- apiGroups:
+ - networking.k8s.io
+ resources:
+ - ingresses
+ verbs:
+ - create
+ - delete
+ - get
+ - list
+ - patch
+ - update
+ - watch
- apiGroups:
- opentelemetry.io
resources:
diff --git a/docs/api.md b/docs/api.md
index aa9e100583..9093d24221 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -1740,6 +1740,13 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector.
ImagePullPolicy indicates the pull policy to be used for retrieving the container image (Always, Never, IfNotPresent)
false |
+
+ | ingress |
+ object |
+
+ Ingress is used to specify how OpenTelemetry Collector is exposed. This functionality is only available if one of the valid modes is set. Valid modes are: deployment, daemonset and statefulset.
+ |
+ false |
| maxReplicas |
integer |
@@ -2474,6 +2481,88 @@ The Secret to select from
+### OpenTelemetryCollector.spec.ingress
+[↩ Parent](#opentelemetrycollectorspec)
+
+
+
+Ingress is used to specify how OpenTelemetry Collector is exposed. This functionality is only available if one of the valid modes is set. Valid modes are: deployment, daemonset and statefulset.
+
+
+
+
+ | Name |
+ Type |
+ Description |
+ Required |
+
+
+
+ | annotations |
+ map[string]string |
+
+ Annotations to add to ingress. e.g. 'cert-manager.io/cluster-issuer: "letsencrypt"'
+ |
+ false |
+
+ | hostname |
+ string |
+
+ Hostname by which the ingress proxy can be reached.
+ |
+ false |
+
+ | tls |
+ []object |
+
+ TLS configuration.
+ |
+ false |
+
+ | type |
+ string |
+
+ Type default value is: none Supported types are: ingress
+ |
+ false |
+
+
+
+
+### OpenTelemetryCollector.spec.ingress.tls[index]
+[↩ Parent](#opentelemetrycollectorspecingress)
+
+
+
+IngressTLS describes the transport layer security associated with an Ingress.
+
+
+
+
+ | Name |
+ Type |
+ Description |
+ Required |
+
+
+
+ | hosts |
+ []string |
+
+ Hosts are a list of hosts included in the TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller fulfilling this Ingress, if left unspecified.
+ |
+ false |
+
+ | secretName |
+ string |
+
+ SecretName is the name of the secret used to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the Host header is used for routing.
+ |
+ false |
+
+
+
+
### OpenTelemetryCollector.spec.podSecurityContext
[↩ Parent](#opentelemetrycollectorspec)