Skip to content

Commit

Permalink
fix(helm-chart): remove double templating of annotations (#2770)
Browse files Browse the repository at this point in the history
Signed-off-by: RealAnna <anna.reale@dynatrace.com>
Signed-off-by: RealAnna <89971034+RealAnna@users.noreply.github.com>
  • Loading branch information
RealAnna committed Jan 9, 2024
1 parent fd7b534 commit b7a1d29
Show file tree
Hide file tree
Showing 61 changed files with 267 additions and 78 deletions.
23 changes: 14 additions & 9 deletions .github/scripts/.helm-tests/certificates-only/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ kind: ServiceAccount
metadata:
name: certificate-operator
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/part-of: keptn
Expand All @@ -14,15 +16,15 @@ metadata:
app.kubernetes.io/version: vmyversion
helm.sh/chart: cert-manager-0.2.0
mamma: test
annotations:
ciao: commonannotation
---
# Source: keptn/charts/certManager/templates/certificate-operator-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: certificate-operator-role
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/instance: keptn-test
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -76,6 +78,8 @@ kind: ClusterRoleBinding
metadata:
name: certificate-operator-rolebinding
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: certificate-operator
Expand All @@ -101,15 +105,15 @@ kind: Role
metadata:
name: certificate-operator-role
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/instance: keptn-test
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: cert-manager
app.kubernetes.io/version: vmyversion
helm.sh/chart: cert-manager-0.2.0
mamma: test
annotations:
ciao: commonannotation
rules:
- apiGroups:
- ""
Expand All @@ -136,6 +140,8 @@ kind: RoleBinding
metadata:
name: certificate-operator-leader-election-rolebinding
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: certificate-operator
Expand All @@ -146,7 +152,6 @@ metadata:
app.kubernetes.io/version: vmyversion
helm.sh/chart: cert-manager-0.2.0
mamma: test
annotations:
ciao: commonannotation
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -163,6 +168,8 @@ kind: RoleBinding
metadata:
name: certificate-operator-role-binding
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: certificate-operator
Expand All @@ -173,8 +180,6 @@ metadata:
app.kubernetes.io/version: vmyversion
helm.sh/chart: cert-manager-0.2.0
mamma: test
annotations:
ciao: commonannotation
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand All @@ -190,6 +195,8 @@ kind: Deployment
metadata:
name: certificate-operator
namespace: "helmtests"
annotations:
ciao: commonannotation
labels:
app.kubernetes.io/component: keptn-cert-manager
app.kubernetes.io/part-of: keptn
Expand All @@ -200,8 +207,6 @@ metadata:
app.kubernetes.io/version: vmyversion
helm.sh/chart: cert-manager-0.2.0
mamma: test
annotations:
ciao: commonannotation
spec:
replicas: 1
selector:
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/.helm-tests/default/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11730,6 +11730,11 @@ metadata:
name: lifecycle-webhook-service
namespace: "helmtests"
labels:
app.kubernetes.io/instance: keptn-test
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: lifecycle-operator
app.kubernetes.io/version: vmyversion
helm.sh/chart: lifecycle-operator-0.1.0
spec:
type: ClusterIP
selector:
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/.helm-tests/lifecycle-only/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9357,6 +9357,11 @@ metadata:
name: lifecycle-webhook-service
namespace: "helmtests"
labels:
app.kubernetes.io/instance: keptn-test
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: lifecycle-operator
app.kubernetes.io/version: vmyversion
helm.sh/chart: lifecycle-operator-0.1.0
spec:
type: ClusterIP
selector:
Expand Down

0 comments on commit b7a1d29

Please sign in to comment.