Skip to content

Commit 5d15d47

Browse files
authored
Merge pull request #2 from kubewarden/renaming
Rename chimera-controller to kubewarde-controller
2 parents 317c01b + 4da55cb commit 5d15d47

15 files changed

+83
-83
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Chimera helm-charts
1+
# Kubewarden helm-charts
22

3-
This repository contains the helm charts used to deploy the Chimera stack.
3+
This repository contains the helm charts used to deploy the Kubewarden stack.

charts/chimera-controller/templates/NOTES.txt

-6
This file was deleted.

charts/chimera-controller/templates/service.yaml

-13
This file was deleted.

charts/chimera-controller/templates/serviceaccount.yaml

-6
This file was deleted.
File renamed without changes.

charts/chimera-controller/Chart.yaml charts/kubewarden-controller/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v2
2-
name: chimera-controller
3-
description: A Helm chart for deploying the Chimera stack
2+
name: kubewarden-controller
3+
description: A Helm chart for deploying the Kubewarden stack
44

55
type: application
66

77
# This is the chart version. This version number should be incremented each time you make changes
88
# to the chart and its templates, including the app version.
99
# Versions are expected to follow Semantic Versioning (https://semver.org/)
10-
version: 0.1.2
10+
version: 0.1.0
1111

1212
# This is the version number of the application being deployed. This version number should be
1313
# incremented each time you make changes to the application. Versions are not expected to

charts/chimera-controller/crds/admissionpolicies.yaml charts/kubewarden-controller/crds/clusteradmissionpolicies.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.4.1
66
creationTimestamp: null
7-
name: admissionpolicies.chimera.suse.com
7+
name: clusteradmissionpolicies.policies.kubewarden.io
88
spec:
9-
group: chimera.suse.com
9+
group: policies.kubewarden.io
1010
names:
11-
kind: AdmissionPolicy
12-
listKind: AdmissionPolicyList
13-
plural: admissionpolicies
14-
singular: admissionpolicy
11+
kind: ClusterAdmissionPolicy
12+
listKind: ClusterAdmissionPolicyList
13+
plural: clusteradmissionpolicies
14+
singular: clusteradmissionpolicy
1515
scope: Cluster
1616
versions:
1717
- name: v1alpha1
1818
schema:
1919
openAPIV3Schema:
20-
description: AdmissionPolicy is the Schema for the admissionpolicies API
20+
description: ClusterAdmissionPolicy is the Schema for the cluster clusteradmissionpolicies API
2121
properties:
2222
apiVersion:
2323
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -28,7 +28,7 @@ spec:
2828
metadata:
2929
type: object
3030
spec:
31-
description: AdmissionPolicySpec defines the desired state of AdmissionPolicy
31+
description: ClusterAdmissionPolicySpec defines the desired state of ClusterAdmissionPolicy
3232
properties:
3333
apiGroups:
3434
description: APIGroups is a list of API groups that this webhook should be registered against. Empty array or "*" means everything.
@@ -67,7 +67,7 @@ spec:
6767
- mutating
6868
type: object
6969
status:
70-
description: AdmissionPolicyStatus defines the observed state of AdmissionPolicy
70+
description: ClusterAdmissionPolicyStatus defines the observed state of ClusterAdmissionPolicy
7171
type: object
7272
type: object
7373
served: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
kubewarden-controller installed.
2+
3+
You can start defining cluster admission policies by using the
4+
`clusteradmissionpolicies.policies.kubewarden.io` resource.
5+
6+
For more information checkout https://kubewarden.io/

charts/chimera-controller/templates/_helpers.tpl charts/kubewarden-controller/templates/_helpers.tpl

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "chimera-controller.name" -}}
4+
{{- define "kubewarden-controller.name" -}}
55
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
66
{{- end }}
77

@@ -10,7 +10,7 @@ Create a default fully qualified app name.
1010
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1111
If release name contains chart name it will be used as a full name.
1212
*/}}
13-
{{- define "chimera-controller.fullname" -}}
13+
{{- define "kubewarden-controller.fullname" -}}
1414
{{- if .Values.fullnameOverride }}
1515
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
1616
{{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
2626
{{/*
2727
Create chart name and version as used by the chart label.
2828
*/}}
29-
{{- define "chimera-controller.chart" -}}
29+
{{- define "kubewarden-controller.chart" -}}
3030
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
3131
{{- end }}
3232

3333
{{/*
3434
Common labels
3535
*/}}
36-
{{- define "chimera-controller.labels" -}}
37-
helm.sh/chart: {{ include "chimera-controller.chart" . }}
38-
{{ include "chimera-controller.selectorLabels" . }}
36+
{{- define "kubewarden-controller.labels" -}}
37+
helm.sh/chart: {{ include "kubewarden-controller.chart" . }}
38+
{{ include "kubewarden-controller.selectorLabels" . }}
3939
{{- if .Chart.AppVersion }}
4040
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4141
{{- end }}
@@ -45,14 +45,14 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
4545
{{/*
4646
Selector labels
4747
*/}}
48-
{{- define "chimera-controller.selectorLabels" -}}
49-
app.kubernetes.io/name: {{ include "chimera-controller.name" . }}
48+
{{- define "kubewarden-controller.selectorLabels" -}}
49+
app.kubernetes.io/name: {{ include "kubewarden-controller.name" . }}
5050
app.kubernetes.io/instance: {{ .Release.Name }}
5151
{{- end }}
5252

5353
{{/*
5454
Create the name of the service account to use
5555
*/}}
56-
{{- define "chimera-controller.serviceAccountName" -}}
57-
{{- include "chimera-controller.fullname" . }}
56+
{{- define "kubewarden-controller.serviceAccountName" -}}
57+
{{- include "kubewarden-controller.fullname" . }}
5858
{{- end }}

charts/chimera-controller/templates/deployment.yaml charts/kubewarden-controller/templates/deployment.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ include "chimera-controller.fullname" . }}
4+
name: {{ include "kubewarden-controller.fullname" . }}
55
labels:
6-
{{- include "chimera-controller.labels" . | nindent 4 }}
6+
{{- include "kubewarden-controller.labels" . | nindent 4 }}
77
spec:
88
replicas: 1
99
selector:
1010
matchLabels:
11-
{{- include "chimera-controller.selectorLabels" . | nindent 6 }}
11+
{{- include "kubewarden-controller.selectorLabels" . | nindent 6 }}
1212
template:
1313
metadata:
1414
{{- with .Values.podAnnotations }}
1515
annotations:
1616
{{- toYaml . | nindent 8 }}
1717
{{- end }}
1818
labels:
19-
{{- include "chimera-controller.selectorLabels" . | nindent 8 }}
19+
{{- include "kubewarden-controller.selectorLabels" . | nindent 8 }}
2020
spec:
2121
{{- with .Values.imagePullSecrets }}
2222
imagePullSecrets:
2323
{{- toYaml . | nindent 8 }}
2424
{{- end }}
25-
serviceAccountName: {{ include "chimera-controller.serviceAccountName" . }}
25+
serviceAccountName: {{ include "kubewarden-controller.serviceAccountName" . }}
2626
containers:
2727
- name: kube-rbac-proxy
2828
args:
@@ -41,7 +41,7 @@ spec:
4141
- --deployments-namespace={{ .Release.Namespace }}
4242
command:
4343
- /manager
44-
image: '{{ .Values.image.repository | default "ghcr.io/chimera-kube/chimera-controller" }}:{{ .Values.image.tag | default .Chart.AppVersion }}'
44+
image: '{{ .Values.image.repository | default "ghcr.io/kubewarden-kube/kubewarden-controller" }}:{{ .Values.image.tag | default .Chart.AppVersion }}'
4545
imagePullPolicy: {{ .Values.image.pullPolicy }}
4646
resources:
4747
limits:

charts/chimera-controller/templates/rbac.yaml charts/kubewarden-controller/templates/rbac.yaml

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: Role
33
metadata:
4-
name: chimera-controller-leader-election-role
4+
name: kubewarden-controller-leader-election-role
55
rules:
66
- apiGroups:
77
- ""
@@ -33,7 +33,7 @@ rules:
3333
apiVersion: rbac.authorization.k8s.io/v1
3434
kind: Role
3535
metadata:
36-
name: chimera-controller-manager-namespaced-role
36+
name: kubewarden-controller-manager-namespaced-role
3737
rules:
3838
- apiGroups:
3939
- ""
@@ -63,7 +63,7 @@ apiVersion: rbac.authorization.k8s.io/v1
6363
kind: ClusterRole
6464
metadata:
6565
creationTimestamp: null
66-
name: chimera-controller-manager-cluster-role
66+
name: kubewarden-controller-manager-cluster-role
6767
rules:
6868
- apiGroups:
6969
- admissionregistration.k8s.io
@@ -92,12 +92,12 @@ apiVersion: rbac.authorization.k8s.io/v1
9292
kind: ClusterRole
9393
metadata:
9494
creationTimestamp: null
95-
name: chimera-controller-manager-role
95+
name: kubewarden-controller-manager-role
9696
rules:
9797
- apiGroups:
98-
- chimera.suse.com
98+
- policies.kubewarden.io
9999
resources:
100-
- admissionpolicies
100+
- clusteradmissionpolicies
101101
verbs:
102102
- create
103103
- delete
@@ -107,9 +107,9 @@ rules:
107107
- update
108108
- watch
109109
- apiGroups:
110-
- chimera.suse.com
110+
- policies.kubewarden.io
111111
resources:
112-
- admissionpolicies/status
112+
- clusteradmissionpolicies/status
113113
verbs:
114114
- get
115115
- patch
@@ -118,7 +118,7 @@ rules:
118118
apiVersion: rbac.authorization.k8s.io/v1
119119
kind: ClusterRole
120120
metadata:
121-
name: chimera-controller-metrics-reader
121+
name: kubewarden-controller-metrics-reader
122122
rules:
123123
- nonResourceURLs:
124124
- /metrics
@@ -128,7 +128,7 @@ rules:
128128
apiVersion: rbac.authorization.k8s.io/v1
129129
kind: ClusterRole
130130
metadata:
131-
name: chimera-controller-proxy-role
131+
name: kubewarden-controller-proxy-role
132132
rules:
133133
- apiGroups:
134134
- authentication.k8s.io
@@ -146,66 +146,66 @@ rules:
146146
apiVersion: rbac.authorization.k8s.io/v1
147147
kind: RoleBinding
148148
metadata:
149-
name: chimera-controller-leader-election-rolebinding
149+
name: kubewarden-controller-leader-election-rolebinding
150150
roleRef:
151151
apiGroup: rbac.authorization.k8s.io
152152
kind: Role
153-
name: chimera-controller-leader-election-role
153+
name: kubewarden-controller-leader-election-role
154154
subjects:
155155
- kind: ServiceAccount
156-
name: {{ include "chimera-controller.serviceAccountName" . }}
156+
name: {{ include "kubewarden-controller.serviceAccountName" . }}
157157
namespace: {{ .Release.Namespace }}
158158
---
159159
apiVersion: rbac.authorization.k8s.io/v1
160160
kind: RoleBinding
161161
metadata:
162162
creationTimestamp: null
163-
name: chimera-controller-manager-namespaced-rolebinding
163+
name: kubewarden-controller-manager-namespaced-rolebinding
164164
roleRef:
165165
apiGroup: rbac.authorization.k8s.io
166166
kind: Role
167-
name: chimera-controller-manager-namespaced-role
167+
name: kubewarden-controller-manager-namespaced-role
168168
subjects:
169169
- kind: ServiceAccount
170-
name: {{ include "chimera-controller.serviceAccountName" . }}
170+
name: {{ include "kubewarden-controller.serviceAccountName" . }}
171171
namespace: {{ .Release.Namespace }}
172172
---
173173
apiVersion: rbac.authorization.k8s.io/v1
174174
kind: ClusterRoleBinding
175175
metadata:
176176
creationTimestamp: null
177-
name: chimera-controller-manager-cluster-role
177+
name: kubewarden-controller-manager-cluster-role
178178
roleRef:
179179
apiGroup: rbac.authorization.k8s.io
180180
kind: ClusterRole
181-
name: chimera-controller-manager-cluster-role
181+
name: kubewarden-controller-manager-cluster-role
182182
subjects:
183183
- kind: ServiceAccount
184-
name: {{ include "chimera-controller.serviceAccountName" . }}
184+
name: {{ include "kubewarden-controller.serviceAccountName" . }}
185185
namespace: {{ .Release.Namespace }}
186186
---
187187
apiVersion: rbac.authorization.k8s.io/v1
188188
kind: ClusterRoleBinding
189189
metadata:
190-
name: chimera-controller-manager-rolebinding
190+
name: kubewarden-controller-manager-rolebinding
191191
roleRef:
192192
apiGroup: rbac.authorization.k8s.io
193193
kind: ClusterRole
194-
name: chimera-controller-manager-role
194+
name: kubewarden-controller-manager-role
195195
subjects:
196196
- kind: ServiceAccount
197-
name: {{ include "chimera-controller.serviceAccountName" . }}
197+
name: {{ include "kubewarden-controller.serviceAccountName" . }}
198198
namespace: {{ .Release.Namespace }}
199199
---
200200
apiVersion: rbac.authorization.k8s.io/v1
201201
kind: ClusterRoleBinding
202202
metadata:
203-
name: chimera-controller-proxy-rolebinding
203+
name: kubewarden-controller-proxy-rolebinding
204204
roleRef:
205205
apiGroup: rbac.authorization.k8s.io
206206
kind: ClusterRole
207-
name: chimera-controller-proxy-role
207+
name: kubewarden-controller-proxy-role
208208
subjects:
209209
- kind: ServiceAccount
210-
name: {{ include "chimera-controller.serviceAccountName" . }}
210+
name: {{ include "kubewarden-controller.serviceAccountName" . }}
211211
namespace: {{ .Release.Namespace }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: {{ include "kubewarden-controller.fullname" . }}-metrics-service
5+
labels:
6+
{{- include "kubewarden-controller.labels" . | nindent 4 }}
7+
spec:
8+
ports:
9+
- name: https
10+
port: 8443
11+
targetPort: https
12+
selector:
13+
{{- include "kubewarden-controller.selectorLabels" . | nindent 4 }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: {{ include "kubewarden-controller.serviceAccountName" . }}
5+
labels:
6+
{{- include "kubewarden-controller.labels" . | nindent 4 }}

0 commit comments

Comments
 (0)