From e0ab7eda1b1013e3246b0db28689b0749158f0bf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jan 2020 18:08:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/clusters/applications.md | 60 ++++++++++++++++++++++ doc/user/project/operations/error_tracking.md | 2 +- .../project/repository/repository_mirroring.md | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) (limited to 'doc/user') diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 47d835a1622..c60e28644b4 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -477,6 +477,7 @@ Supported applications: - [cert-manager](#install-cert-manager-using-gitlab-ci) - [Sentry](#install-sentry-using-gitlab-ci) - [GitLab Runner](#install-gitlab-runner-using-gitlab-ci) +- [Cilium](#install-cilium-using-gitlab-ci) ### Usage @@ -661,6 +662,65 @@ management project. Refer to the [chart](https://gitlab.com/gitlab-org/charts/gitlab-runner) for the available configuration options. +### Install Cilium using GitLab CI + +> [Introduced](https://gitlab.com/gitlab-org/cluster-integration/cluster-applications/merge_requests/22) in GitLab 12.7. + +[Cilium](https://cilium.io/) is a networking plugin for Kubernetes +that you can use to implement support for +[NetworkPolicy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) +resources. + +Enable Cilium in the `.gitlab/managed-apps/config.yaml` file to install it: + +```yaml +# possible values are gke, eks or you can leave it blank +clusterType: gke + +cilium: + installed: true +``` + +The `clusterType` variable enables the recommended Helm variables for +a corresponding cluster type, the default value is blank. You can +check the recommended variables for each cluster type in the official +documentation: + +- [Google GKE](https://cilium.readthedocs.io/en/stable/gettingstarted/k8s-install-gke/#prepare-deploy-cilium) +- [AWS EKS](https://cilium.readthedocs.io/en/stable/gettingstarted/k8s-install-eks/#prepare-deploy-cilium) + +You can customize Cilium's Helm variables by defining the +`.gitlab/managed-apps/cilium/values.yaml` file in your cluster +management project. Refer to the +[Cilium chart](https://github.com/cilium/cilium/tree/master/install/kubernetes/cilium) +for the available configuration options. + +CAUTION: **Caution:** +Installation and removal of the Cilium [requires restart](https://cilium.readthedocs.io/en/stable/gettingstarted/k8s-install-gke/#restart-remaining-pods) +of all affected pods in all namespaces to ensure that they are +[managed](https://cilium.readthedocs.io/en/stable/troubleshooting/#ensure-pod-is-managed-by-cilium) +by the correct networking plugin. + +NOTE: **Note:** +Major upgrades might require additional setup steps, please consult +the official [upgrade guide](https://docs.cilium.io/en/stable/install/upgrade/) for more +information. + +By default, the drop log for traffic is logged out by the +`cilium-monitor` sidecar container. You can check these logs via: + +```bash +kubectl -n gitlab-managed-apps logs cilium-XXXX cilium-monitor +``` + +Drop logging can be disabled via `.gitlab/managed-apps/cilium/values.yaml`: + +```yml +agent: + monitor: + enabled: false +``` + ## Upgrading applications > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/24789) in GitLab 11.8. diff --git a/doc/user/project/operations/error_tracking.md b/doc/user/project/operations/error_tracking.md index 447d294bef8..361dfe57d78 100644 --- a/doc/user/project/operations/error_tracking.md +++ b/doc/user/project/operations/error_tracking.md @@ -10,7 +10,7 @@ Error tracking allows developers to easily discover and view the errors that the ### Deploying Sentry -You may sign up to the cloud hosted or deploy your own [on-premise instance](https://docs.sentry.io/server/installation/). +You may sign up to the cloud hosted , deploy your own [on-premise instance](https://docs.sentry.io/server/installation/) or use GitLab to [install Sentry to a Kubernetes cluster](../../clusters/applications.md#install-sentry-using-gitlab-ci). ### Enabling Sentry diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md index 6da745a8772..09506da6e90 100644 --- a/doc/user/project/repository/repository_mirroring.md +++ b/doc/user/project/repository/repository_mirroring.md @@ -341,7 +341,7 @@ the upstream Git repository. In this configuration one Git repository acts as the authoritative upstream, and the other as downstream. The `pre-receive` hook will be installed on the downstream repository. -Read about [configuring custom Git hooks](../../../administration/custom_hooks.md) on the GitLab server. +Read about [configuring Server hooks](../../../administration/server_hooks.md) on the GitLab server. A sample `pre-receive` hook is provided below. -- cgit v1.2.3