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

Enable webhooks by default in chart #313

Merged
merged 6 commits into from
Sep 30, 2018
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
10 changes: 5 additions & 5 deletions chart/kubedb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The following table lists the configurable parameters of the KubeDB chart and th
| `kubedb.registry` | Docker registry used to pull Kubedb operator image | `kubedb` |
| `kubedb.repository` | Kubedb operator container image | `operator` |
| `kubedb.tag` | Kubedb operator container image tag | `0.9.0-beta.0` |
| `cleaner.registry` | Docker registry used to pull Webhook cleaner image | `appcode` |
| `cleaner.registry` | Docker registry used to pull Webhook cleaner image | `appscode` |
| `cleaner.repository` | Webhook cleaner container image | `kubectl` |
| `cleaner.tag` | Webhook cleaner container image tag | `v1.11` |
| `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) |
Expand All @@ -64,10 +64,10 @@ The following table lists the configurable parameters of the KubeDB chart and th
| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | `` |
| `apiserver.groupPriorityMinimum` | The minimum priority the group should have. | 10000 |
| `apiserver.versionPriority` | The ordering of this API inside of the group. | 15 |
| `apiserver.enableValidatingWebhook` | Enable validating webhooks for KubeDB CRDs | false |
| `apiserver.enableMutatingWebhook` | Enable mutating webhooks for KubeDB CRDs | false |
| `apiserver.ca` | CA certificate used by main Kubernetes api server | `` |
| `apiserver.enableStatusSubresource` | If true, uses status sub resource for crds | `false` |
| `apiserver.enableValidatingWebhook` | Enable validating webhooks for KubeDB CRDs | `true` |
| `apiserver.enableMutatingWebhook` | Enable mutating webhooks for KubeDB CRDs | `true` |
| `apiserver.ca` | CA certificate used by main Kubernetes api server | `not-ca-cert` |
| `apiserver.disableStatusSubresource` | If true, disables status sub resource for crds. Otherwise enables based on Kubernetes version | `false` |
| `enableAnalytics` | Send usage events to Google Analytics | `true` |


Expand Down
2 changes: 2 additions & 0 deletions chart/kubedb/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
To verify that KubeDB has started, run:

kubectl --namespace={{ .Release.Namespace }} get deployments -l "release={{ .Release.Name }}, app={{ template "kubedb.name" . }}"

If you have not installed appscode/kubedb-catalog chart, install it. If already installed, upgrade appscode/kubedb-catalog chart.
11 changes: 5 additions & 6 deletions chart/kubedb/templates/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ rules:
resources:
- customresourcedefinitions
verbs:
- '*'
- "*"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tamalsaha Just a small cosmetic thing: It would be nice to be consistent at least in the same file, and use the same list format. This line uses yaml format, while most of the others using JSON.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed #319

- apiGroups:
- admissionregistration.k8s.io
resources:
- mutatingwebhookconfigurations
- validatingwebhookconfigurations
verbs:
- delete
verbs: ["delete", "list", "watch", "patch"]
- apiGroups:
- rbac.authorization.k8s.io
resources:
Expand Down Expand Up @@ -59,7 +58,7 @@ rules:
- ""
resources:
- pods
verbs: ["deletecollection", "get", "list", "patch", "watch"]
verbs: ["*"]
- apiGroups:
- ""
resources:
Expand All @@ -84,8 +83,8 @@ rules:
- kubedb.com
- catalog.kubedb.com
resources:
- '*'
verbs: ['*']
- "*"
verbs: ["*"]
- apiGroups:
- monitoring.coreos.com
resources:
Expand Down
9 changes: 7 additions & 2 deletions chart/kubedb/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
apiVersion: apps/v1beta1
# GKE returns Major:"1", Minor:"10+"
{{- $major := default "0" .Capabilities.KubeVersion.Major | trimSuffix "+" | int64 }}
{{- $minor := default "0" .Capabilities.KubeVersion.Minor | trimSuffix "+" | int64 }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "kubedb.fullname" . }}
Expand Down Expand Up @@ -46,7 +49,9 @@ spec:
- --audit-log-path=-
- --tls-cert-file=/var/serving-cert/tls.crt
- --tls-private-key-file=/var/serving-cert/tls.key
- --enable-status-subresource={{ .Values.apiserver.enableStatusSubresource }}
{{- if and (not .Values.apiserver.disableStatusSubresource) (ge $major 1) (ge $minor 11) }}
- --enable-status-subresource=true
{{- end }}
- --enable-analytics={{ .Values.enableAnalytics }}
env:
- name: OPERATOR_NAMESPACE
Expand Down
13 changes: 7 additions & 6 deletions chart/kubedb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ kubedb:
repository: operator
tag: 0.9.0-beta.0
cleaner:
registry: appcode
registry: appscode
repository: kubectl
tag: v1.11
## Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -66,13 +66,14 @@ apiserver:
# for more information on proper values of this field
versionPriority: 15
# enableMutatingWebhook is used to configure mutating webhook for KubeDB CRDs
enableMutatingWebhook: false
enableMutatingWebhook: true
# enableValidatingWebhook is used to configure validating webhook for KubeDB CRDs
enableValidatingWebhook: false
enableValidatingWebhook: true
# CA certificate used by main Kubernetes api server
ca:
# If true, uses status sub resource for crds.
enableStatusSubresource: false
ca: not-ca-cert
# If true, disables status sub resource for crds.
# Otherwise, enables status sub resource for Kubernetes version >= 1.11 and disables for other versions.
disableStatusSubresource: false

# Send usage events to Google Analytics
enableAnalytics: true
33 changes: 1 addition & 32 deletions docs/setup/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,8 @@ NAME CHART VERSION APP VERSION DESCRIPTION
appscode/kubedb 0.9.0-beta.0 0.9.0-beta.0 KubeDB by AppsCode - Production ready databases ...
appscode/kubedb-catalog 0.9.0-beta.0 0.9.0-beta.0 KubeDB Catalog by AppsCode - Catalog for database versions

# Step 1(a): Kubernetes 1.9.x - 1.10.x
$ helm install appscode/kubedb --name kubedb-operator --version 0.9.0-beta.0 \
--namespace kube-system \
--set apiserver.ca="$(onessl get kube-ca)" \
--set apiserver.enableValidatingWebhook=true \
--set apiserver.enableMutatingWebhook=true

# Step 1(b): Kubernetes 1.11.0 or later
$ helm install appscode/kubedb --name kubedb-operator --version 0.9.0-beta.0 \
--namespace kube-system \
--set apiserver.ca="$(onessl get kube-ca)" \
--set apiserver.enableValidatingWebhook=true \
--set apiserver.enableMutatingWebhook=true \
--set apiserver.enableStatusSubresource=true
--namespace kube-system

# Step 2: wait until crds are registered
$ kubectl get crds -l app=kubedb -w
Expand All @@ -168,25 +156,6 @@ snapshots.kubedb.com 6s
$ helm install appscode/kubedb-catalog --name kubedb-catalog
```

To install `onessl`, run the following commands:

```console
# Mac OSX amd64:
curl -fsSL -o onessl https://github.com/kubepack/onessl/releases/download/0.7.0/onessl-darwin-amd64 \
&& chmod +x onessl \
&& sudo mv onessl /usr/local/bin/

# Linux amd64:
curl -fsSL -o onessl https://github.com/kubepack/onessl/releases/download/0.7.0/onessl-linux-amd64 \
&& chmod +x onessl \
&& sudo mv onessl /usr/local/bin/

# Linux arm64:
curl -fsSL -o onessl https://github.com/kubepack/onessl/releases/download/0.7.0/onessl-linux-arm64 \
&& chmod +x onessl \
&& sudo mv onessl /usr/local/bin/
```

To see the detailed configuration options, visit [here](https://github.com/kubedb/cli/tree/master/chart/kubedb).

</div>
Expand Down
21 changes: 14 additions & 7 deletions hack/deploy/rbac-list.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ rules:
resources:
- customresourcedefinitions
verbs:
- '*'
- "*"
- apiGroups:
- admissionregistration.k8s.io
resources:
- mutatingwebhookconfigurations
- validatingwebhookconfigurations
verbs: ["delete", "list", "watch", "patch"]
- apiGroups:
- rbac.authorization.k8s.io
resources:
Expand Down Expand Up @@ -48,8 +54,7 @@ rules:
- ""
resources:
- pods
verbs:
- '*'
verbs: ["*"]
- apiGroups:
- ""
resources:
Expand All @@ -74,15 +79,17 @@ rules:
- kubedb.com
- catalog.kubedb.com
resources:
- '*'
verbs: ['*']
- "*"
verbs: ["*"]
- apiGroups:
- monitoring.coreos.com
resources:
- servicemonitors
verbs: ["create", "delete", "get", "list", "update"]
- apiGroups: [""]
resources: ["pods/exec"]
- apiGroups:
- ""
resources:
- "pods/exec"
verbs: ["create"]
---
apiVersion: rbac.authorization.k8s.io/v1
Expand Down