Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for setting additional annotations on the CRDs #1402

Closed
wants to merge 1 commit into from
+45 −19
Closed

Add support for setting additional annotations on the CRDs #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.72.0
version: 0.72.1
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
3 changes: 3 additions & 0 deletions charts/opentelemetry-operator/conf/crds/crd-opentelemetry.io_opampbridges.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: {{ include "opentelemetry-operator.webhookCertAnnotation" . }}
controller-gen.kubebuilder.io/version: v0.16.1
{{- range $key, $value := .Values.crds.additionalAnnotations }}
{{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
{{- end }}
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down
3 changes: 3 additions & 0 deletions charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: {{ include "opentelemetry-operator.webhookCertAnnotation" . }}
controller-gen.kubebuilder.io/version: v0.16.1
{{- range $key, $value := .Values.crds.additionalAnnotations }}
{{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
{{- end }}
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down
3 changes: 3 additions & 0 deletions charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
{{- range $key, $value := .Values.crds.additionalAnnotations }}
{{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
{{- end }}
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down
4 changes: 2 additions & 2 deletions ...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -91,7 +91,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
3 changes: 3 additions & 0 deletions ...opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.1
helm.sh/resource-policy: "keep"
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down Expand Up @@ -1772,6 +1773,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.1
helm.sh/resource-policy: "keep"
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down Expand Up @@ -11011,6 +11013,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
helm.sh/resource-policy: "keep"
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
6 changes: 3 additions & 3 deletions charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -32,7 +32,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -44,7 +44,7 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.72.0
helm.sh/chart: opentelemetry-operator-0.72.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 4 additions & 0 deletions charts/opentelemetry-operator/examples/default/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
manager:
collectorImage:
repository: "otel/opentelemetry-collector-k8s"

crds:
additionalAnnotations:
helm.sh/resource-policy: keep
8 changes: 8 additions & 0 deletions charts/opentelemetry-operator/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,6 +1694,14 @@
"examples": [
true
]
},
"additionalAnnotations": {
"type": "object",
"default": {},
"title": "The serviceAnnotations Schema",
"required": [],
"properties": {},
"examples": [{}]
}
},
"examples": [{
Expand Down
2 changes: 2 additions & 0 deletions charts/opentelemetry-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ admissionWebhooks:
## See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/UPGRADING.md#0560-to-0570 for more details.
crds:
create: true
# Add annotations to the CRDs
additionalAnnotations: {}

## Create the provided Roles and RoleBindings
##
Expand Down
Loading