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

Revert "ci: update Core Operator chart from latest version internally (#285)" #287

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions charts/core-crd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: core-crd
description: A Helm chart for Kubernetes
type: application
version: 3.12.0
appVersion: "v3.12.0"
version: 3.8.0
appVersion: "v3.8.0"
maintainers:
- name: Calyptia
email: [email protected]
Expand Down
7 changes: 0 additions & 7 deletions charts/core-crd/templates/pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -788,10 +788,6 @@ spec:
kind:
description: Enums
type: string
labels:
additionalProperties:
type: string
type: object
ports:
items:
properties:
Expand Down Expand Up @@ -848,9 +844,6 @@ spec:
type: object
type: object
type: object
serviceAccount:
description: service account for pipelines
type: string
tolerations:
items:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion charts/core-crd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ images:
fluentBit:
registry: ghcr.io
repository: calyptia/core/calyptia-fluent-bit
tag: 24.11.2
tag: 24.11.1
pullSecrets: []
ingestCheck:
registry: ghcr.io
Expand Down
4 changes: 2 additions & 2 deletions charts/core-instance/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ description: Calyptia Core Instance chart
home: https://calyptia.com/products/core/
icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
type: application
version: 3.12.0
appVersion: "v3.12.0"
version: 3.8.0
appVersion: "v3.8.0"
maintainers:
- name: Calyptia
email: [email protected]
Expand Down
4 changes: 2 additions & 2 deletions charts/core-instance/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ images:
fromCloud:
registry: ghcr.io
repository: calyptia/core-operator/sync-from-cloud
tag: 3.12.0
tag: 3.8.0
pullSecrets: []
toCloud:
registry: ghcr.io
repository: calyptia/core-operator/sync-to-cloud
tag: 3.12.0
tag: 3.8.0
pullSecrets: []
hotReload:
registry: ghcr.io
Expand Down
4 changes: 2 additions & 2 deletions charts/core-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ description: Calyptia Core Operator chart
home: https://calyptia.com/products/core/
icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
type: application
version: 3.12.0
appVersion: "v3.12.0"
version: 3.8.0
appVersion: "v3.8.0"
maintainers:
- name: Calyptia
email: [email protected]
Expand Down
3 changes: 0 additions & 3 deletions charts/core-operator/templates/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ spec:
{{- if .Values.livenessProbe }}
livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }}
{{- end }}
env:
- name: POD_SERVICEACCOUNT
value: calyptia-core-po-sa
name: manager
ports:
- containerPort: 8443
Expand Down
23 changes: 0 additions & 23 deletions charts/core-operator/templates/rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,5 @@ subjects:
- kind: ServiceAccount
name: {{ template "operator.serviceAccountName" . }}
namespace: {{ include "common.names.namespace" . | quote }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/created-by: core-operator
app.kubernetes.io/managed-by: core-operator
app.kubernetes.io/part-of: calyptia
calyptia.core: core-operator
name: calyptia-core-pod-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: calyptia-core-pod-role
subjects:
- kind: ServiceAccount
name: calyptia-core-po-sa
namespace: {{ .Release.Namespace }}
{{- range .Values.serviceAccounts }}
- kind: ServiceAccount
name: {{ .name | quote }}
namespace: {{ .namespace | quote }}
{{- end }}
{{- end -}}
{{- end }}
16 changes: 0 additions & 16 deletions charts/core-operator/templates/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,5 @@ metadata:
calyptia.core: core-operator
name: {{ template "operator.serviceAccountName" . }}
namespace: {{ include "common.names.namespace" . | quote }}
---
---
apiVersion: v1
kind: ServiceAccount
metadata:
{{- $mergedAnnotations := merge .Values.serviceAccount.annotations .Values.commonAnnotations }}
{{- if $mergedAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $mergedAnnotations "context" $ ) | nindent 4 }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: operator
app.kubernetes.io/part-of: operator
calyptia.core: core-operator
name: calyptia-core-po-sa
namespace: {{ include "common.names.namespace" . | quote }}
{{- end }}
{{- end }}
8 changes: 0 additions & 8 deletions charts/core-operator/tests/manager_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,3 @@ tests:
- equal:
path: spec.template.spec.tolerations[0].operator
value: "Exists"
- it: checks env var
asserts:
- equal:
path: spec.template.spec.containers[0].env[0]
value:
name: POD_SERVICEACCOUNT
value: calyptia-core-po-sa

6 changes: 1 addition & 5 deletions charts/core-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ images:
operator:
registry: ghcr.io
repository: calyptia/core-operator
tag: 3.12.0
tag: 3.8.0
pullSecrets: []
hotReload:
registry: ghcr.io
Expand Down Expand Up @@ -78,7 +78,3 @@ livenessProbe:
initialDelaySeconds: 15
periodSeconds: 20
restartPolicy: Always
serviceAccounts: []
# - name: exampleSA
# namespace: exampleNamespace
podServiceAccount: calyptia-core-po-sa
Loading