Skip to content

Commit c12be21

Browse files
calindcalind
committed
Update kubebuilder project to v2
1 parent 5a9fd76 commit c12be21

File tree

66 files changed

+722
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+722
-113
lines changed

‎Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ GO_INTEGRATION_TESTS_PARAMS ?= -timeout 50m \
4444

4545
TEST_FILTER_PARAM += $(GO_INTEGRATION_TESTS_PARAMS)
4646

47+
# Kubebuilder v2 compatible paths
48+
CRD_DIR := config/crd/bases
49+
RBAC_DIR := config/rbac
4750

4851
CLUSTER_NAME ?= mysql-operator
4952
delete-environment:

‎PROJECT

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1-
version: "1"
1+
version: "2"
22
domain: presslabs.org
3-
repo: github.com/presslabs/mysql-operator
3+
repo: github.com/bitpoke/mysql-operator
4+
resources:
5+
- group: mysql
6+
kind: MysqlCluster
7+
version: v1alpha1
8+
- group: mysql
9+
kind: MysqlBackup
10+
version: v1alpha1
11+
- group: mysql
12+
kind: MysqlDatabase
13+
version: v1alpha1
14+
- group: mysql
15+
kind: MysqlUser
16+
version: v1alpha1

‎config/certmanager/certificate.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# The following manifests contain a self-signed issuer CR and a certificate CR.
2+
# More document can be found at https://docs.cert-manager.io
3+
# WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for
4+
# breaking changes
5+
apiVersion: cert-manager.io/v1alpha2
6+
kind: Issuer
7+
metadata:
8+
name: selfsigned-issuer
9+
namespace: system
10+
spec:
11+
selfSigned: {}
12+
---
13+
apiVersion: cert-manager.io/v1alpha2
14+
kind: Certificate
15+
metadata:
16+
name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml
17+
namespace: system
18+
spec:
19+
# $(SERVICE_NAME) and $(SERVICE_NAMESPACE) will be substituted by kustomize
20+
dnsNames:
21+
- $(SERVICE_NAME).$(SERVICE_NAMESPACE).svc
22+
- $(SERVICE_NAME).$(SERVICE_NAMESPACE).svc.cluster.local
23+
issuerRef:
24+
kind: Issuer
25+
name: selfsigned-issuer
26+
secretName: webhook-server-cert # this secret will not be prefixed, since it's not managed by kustomize

‎config/certmanager/kustomization.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resources:
2+
- certificate.yaml
3+
4+
configurations:
5+
- kustomizeconfig.yaml

‎config/certmanager/kustomizeconfig.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This configuration is for teaching kustomize how to update name ref and var substitution
2+
nameReference:
3+
- kind: Issuer
4+
group: cert-manager.io
5+
fieldSpecs:
6+
- kind: Certificate
7+
group: cert-manager.io
8+
path: spec/issuerRef/name
9+
10+
varReference:
11+
- kind: Certificate
12+
group: cert-manager.io
13+
path: spec/commonName
14+
- kind: Certificate
15+
group: cert-manager.io
16+
path: spec/dnsNames

‎config/crds/mysql.presslabs.org_mysqlbackups.yaml ‎config/crd/bases/mysql.presslabs.org_mysqlbackups.yaml

File renamed without changes.

‎config/crds/mysql.presslabs.org_mysqlclusters.yaml ‎config/crd/bases/mysql.presslabs.org_mysqlclusters.yaml

File renamed without changes.

‎config/crds/mysql.presslabs.org_mysqldatabases.yaml ‎config/crd/bases/mysql.presslabs.org_mysqldatabases.yaml

File renamed without changes.

‎config/crds/mysql.presslabs.org_mysqlusers.yaml ‎config/crd/bases/mysql.presslabs.org_mysqlusers.yaml

File renamed without changes.

‎config/crd/kustomization.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This kustomization.yaml is not intended to be run by itself,
2+
# since it depends on service name and namespace that are out of this kustomize package.
3+
# It should be run by config/default
4+
resources:
5+
- bases/mysql.presslabs.org_mysqlclusters.yaml
6+
- bases/mysql.presslabs.org_mysqlbackups.yaml
7+
- bases/mysql.presslabs.org_mysqlusers.yaml
8+
- bases/mysql.presslabs.org_mysqldatabases.yaml
9+
# +kubebuilder:scaffold:crdkustomizeresource
10+
11+
patchesStrategicMerge:
12+
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
13+
# patches here are for enabling the conversion webhook for each CRD
14+
#- patches/webhook_in_mysqlclusters.yaml
15+
#- patches/webhook_in_mysqlbackups.yaml
16+
#- patches/webhook_in_mysqlusers.yaml
17+
#- patches/webhook_in_mysqldatabases.yaml
18+
# +kubebuilder:scaffold:crdkustomizewebhookpatch
19+
20+
# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
21+
# patches here are for enabling the CA injection for each CRD
22+
#- patches/cainjection_in_mysqlclusters.yaml
23+
#- patches/cainjection_in_mysqlbackups.yaml
24+
#- patches/cainjection_in_mysqlusers.yaml
25+
#- patches/cainjection_in_mysqldatabases.yaml
26+
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
27+
28+
# the following config is for teaching kustomize how to do kustomization for CRDs.
29+
configurations:
30+
- kustomizeconfig.yaml

‎config/crd/kustomizeconfig.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file is for teaching kustomize how to substitute name and namespace reference in CRD
2+
nameReference:
3+
- kind: Service
4+
version: v1
5+
fieldSpecs:
6+
- kind: CustomResourceDefinition
7+
group: apiextensions.k8s.io
8+
path: spec/conversion/webhookClientConfig/service/name
9+
10+
namespace:
11+
- kind: CustomResourceDefinition
12+
group: apiextensions.k8s.io
13+
path: spec/conversion/webhookClientConfig/service/namespace
14+
create: false
15+
16+
varReference:
17+
- path: metadata/annotations

‎config/crd/patches/cainjection_in_mysqlbackups.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# The following patch adds a directive for certmanager to inject CA into the CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
8+
name: mysqlbackups.mysql.presslabs.org

‎config/crd/patches/cainjection_in_mysqlclusters.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# The following patch adds a directive for certmanager to inject CA into the CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
8+
name: mysqlclusters.mysql.presslabs.org

‎config/crd/patches/cainjection_in_mysqldatabases.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# The following patch adds a directive for certmanager to inject CA into the CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
8+
name: mysqldatabases.mysql.presslabs.org

‎config/crd/patches/cainjection_in_mysqlusers.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# The following patch adds a directive for certmanager to inject CA into the CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
8+
name: mysqlusers.mysql.presslabs.org

‎config/crd/patches/webhook_in_mysqlbackups.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# The following patch enables conversion webhook for CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
name: mysqlbackups.mysql.presslabs.org
7+
spec:
8+
conversion:
9+
strategy: Webhook
10+
webhookClientConfig:
11+
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
12+
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
13+
caBundle: Cg==
14+
service:
15+
namespace: system
16+
name: webhook-service
17+
path: /convert

‎config/crd/patches/webhook_in_mysqlclusters.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# The following patch enables conversion webhook for CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
name: mysqlclusters.mysql.presslabs.org
7+
spec:
8+
conversion:
9+
strategy: Webhook
10+
webhookClientConfig:
11+
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
12+
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
13+
caBundle: Cg==
14+
service:
15+
namespace: system
16+
name: webhook-service
17+
path: /convert

‎config/crd/patches/webhook_in_mysqldatabases.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# The following patch enables conversion webhook for CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
name: mysqldatabases.mysql.presslabs.org
7+
spec:
8+
conversion:
9+
strategy: Webhook
10+
webhookClientConfig:
11+
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
12+
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
13+
caBundle: Cg==
14+
service:
15+
namespace: system
16+
name: webhook-service
17+
path: /convert

‎config/crd/patches/webhook_in_mysqlusers.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# The following patch enables conversion webhook for CRD
2+
# CRD conversion requires k8s 1.13 or later.
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
name: mysqlusers.mysql.presslabs.org
7+
spec:
8+
conversion:
9+
strategy: Webhook
10+
webhookClientConfig:
11+
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
12+
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
13+
caBundle: Cg==
14+
service:
15+
namespace: system
16+
name: webhook-service
17+
path: /convert

‎config/default/kustomization.yaml

+55-10
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,59 @@ namePrefix: mysql-operator-
1212
#commonLabels:
1313
# someName: someValue
1414

15-
# Each entry in this list must resolve to an existing
16-
# resource definition in YAML. These are the resource
17-
# files that kustomize reads, modifies and emits as a
18-
# YAML string, with resources separated by document
19-
# markers ("---").
20-
resources:
21-
- ../rbac/*.yaml
22-
- ../manager/*.yaml
15+
bases:
16+
- ../crd
17+
- ../rbac
18+
- ../manager
19+
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
20+
# crd/kustomization.yaml
21+
#- ../webhook
22+
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
23+
#- ../certmanager
24+
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
25+
#- ../prometheus
2326

24-
patches:
25-
- manager_image_patch.yaml
27+
patchesStrategicMerge:
28+
# Protect the /metrics endpoint by putting it behind auth.
29+
# If you want your controller-manager to expose the /metrics
30+
# endpoint w/o any authn/z, please comment the following line.
31+
- manager_auth_proxy_patch.yaml
32+
33+
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
34+
# crd/kustomization.yaml
35+
#- manager_webhook_patch.yaml
36+
37+
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
38+
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
39+
# 'CERTMANAGER' needs to be enabled to use ca injection
40+
#- webhookcainjection_patch.yaml
41+
42+
# the following config is for teaching kustomize how to do var substitution
43+
vars:
44+
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
45+
#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
46+
# objref:
47+
# kind: Certificate
48+
# group: cert-manager.io
49+
# version: v1alpha2
50+
# name: serving-cert # this name should match the one in certificate.yaml
51+
# fieldref:
52+
# fieldpath: metadata.namespace
53+
#- name: CERTIFICATE_NAME
54+
# objref:
55+
# kind: Certificate
56+
# group: cert-manager.io
57+
# version: v1alpha2
58+
# name: serving-cert # this name should match the one in certificate.yaml
59+
#- name: SERVICE_NAMESPACE # namespace of the service
60+
# objref:
61+
# kind: Service
62+
# version: v1
63+
# name: webhook-service
64+
# fieldref:
65+
# fieldpath: metadata.namespace
66+
#- name: SERVICE_NAME
67+
# objref:
68+
# kind: Service
69+
# version: v1
70+
# name: webhook-service

‎config/default/manager_auth_proxy_patch.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This patch inject a sidecar container which is a HTTP proxy for the
2+
# controller manager, it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
3+
apiVersion: apps/v1
4+
kind: Deployment
5+
metadata:
6+
name: controller-manager
7+
namespace: system
8+
spec:
9+
template:
10+
spec:
11+
containers:
12+
- name: kube-rbac-proxy
13+
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
14+
args:
15+
- "--secure-listen-address=0.0.0.0:8443"
16+
- "--upstream=http://127.0.0.1:8080/"
17+
- "--logtostderr=true"
18+
- "--v=10"
19+
ports:
20+
- containerPort: 8443
21+
name: https
22+
- name: manager
23+
args:
24+
- "--metrics-addr=127.0.0.1:8080"
25+
- "--enable-leader-election"

‎config/default/manager_image_patch.yaml

-12
This file was deleted.

‎config/default/manager_webhook_patch.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: controller-manager
5+
namespace: system
6+
spec:
7+
template:
8+
spec:
9+
containers:
10+
- name: manager
11+
ports:
12+
- containerPort: 9443
13+
name: webhook-server
14+
protocol: TCP
15+
volumeMounts:
16+
- mountPath: /tmp/k8s-webhook-server/serving-certs
17+
name: cert
18+
readOnly: true
19+
volumes:
20+
- name: cert
21+
secret:
22+
defaultMode: 420
23+
secretName: webhook-server-cert

‎config/default/webhookcainjection_patch.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This patch add annotation to admission webhook config and
2+
# the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize.
3+
apiVersion: admissionregistration.k8s.io/v1beta1
4+
kind: MutatingWebhookConfiguration
5+
metadata:
6+
name: mutating-webhook-configuration
7+
annotations:
8+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
9+
---
10+
apiVersion: admissionregistration.k8s.io/v1beta1
11+
kind: ValidatingWebhookConfiguration
12+
metadata:
13+
name: validating-webhook-configuration
14+
annotations:
15+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)

‎config/manager/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
resources:
2+
- manager.yaml

0 commit comments

Comments
 (0)