Skip to content

Commit 1c675f4

Browse files
committed
First set of fixes after 20231123
1 parent 2e3961a commit 1c675f4

File tree

7 files changed

+53
-12
lines changed

7 files changed

+53
-12
lines changed

120_kubernetes/rbac/service_account.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Some services require specific permissions
6060

6161
Use RBAC to provide only required permissions
6262

63-
Acces Kubernetes API using environment variables:
63+
Access Kubernetes API using environment variables:
6464

6565
```bash
6666
$ printenv | grep KUBERNETES_ | sort

150_gitlab/000_intro/product.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Based on open-source project, allows your own runners, static websites
4444

4545
gitlab.com: 5GB storage [<i class="fa-solid fa-arrow-up-right-from-square"></i>](https://about.gitlab.com/pricing/#do-the-storage-and-transfer-limits-apply-to-self-managed), 400 minutes/month [<i class="fa-solid fa-arrow-up-right-from-square"></i>](https://about.gitlab.com/pricing/#why-do-i-need-to-enter-credit-debit-card-details-for-free-pipeline-minutes), 5 users/group [<i class="fa-solid fa-arrow-up-right-from-square"></i>](https://about.gitlab.com/pricing/#when-will-the-user-limits-be-effective)
4646

47-
### Premium [<i class="fa-solid fa-arrow-up-right-from-square"></i>](https://about.gitlab.com/pricing/premium/) ($19/user/month)
47+
### Premium [<i class="fa-solid fa-arrow-up-right-from-square"></i>](https://about.gitlab.com/pricing/premium/) ($29/user/month)
4848

4949
Faster code reviews, advanced CI/CD, enterprise agile planning, release controls, support
5050

150_gitlab/030_authentication/slides.md

+24
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,27 @@ Project Deploy SSH Key (read-write) [<i class="fa-solid fa-arrow-up-right-from-s
5252

5353
1. Create a project deploy token
5454
1. Use it to clone the repository
55+
56+
---
57+
58+
## Caveats
59+
60+
### Token creation can be tricky
61+
62+
Role defines the permission level
63+
64+
Scope specified available "features", e.g.
65+
66+
- `(read_)?api`
67+
- `(read|write)_repository`
68+
- `create_runner` ([more](#/gitlab_runner) later)
69+
70+
Expiration defines how long
71+
72+
### Example
73+
74+
Role: Developer
75+
76+
Scope: `read_repository`
77+
78+
User can pull but not push

150_gitlab/060_api/slides.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ GitLab 16.0 (May 2023) sets a 1-year lifetime on such tokens
137137
Rotation API introduced in GitLab 16.0 (May 2023)
138138

139139
- Personal Access Tokens [](https://docs.gitlab.com/ee/api/personal_access_tokens.html#rotate-a-personal-access-token)
140-
- Group Acces Tokens [](https://docs.gitlab.com/ee/api/group_access_tokens.html#rotate-a-group-access-token)
140+
- Group Access Tokens [](https://docs.gitlab.com/ee/api/group_access_tokens.html#rotate-a-group-access-token)
141141
- Project Access Tokens [](https://docs.gitlab.com/ee/api/project_access_tokens.html#rotate-a-project-access-token)
142142

143143
Automatic reuse detection [](https://docs.gitlab.com/ee/api/personal_access_tokens.html#automatic-reuse-detection) prevents use of rotated tokens:

150_gitlab/100_reverse_proxy/slides.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Template [](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitla
3131
Central service for...
3232

3333
- Request routing
34-
- SSL offloading
34+
- TLS offloading
3535

3636
Examples in this workshop use [`traefik`](https://traefik.io/traefik/)
3737

2023-11-23_heise-GitLab-Ops.html

+5-8
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,15 @@
3636
<section data-markdown="" data-separator="^---$" data-separator-vertical="^--$"><textarea data-template="">
3737
<!-- .slide: data-background="150_gitlab/media/fox-5195283_1920.jpg" class="vertical-center" style="padding: 1em 1em 1em 1em; color: white; background: rgba(0, 0, 0, 0.5); width: 90%; margin: auto;" -->
3838

39-
![](150_gitlab/media/gitlab-icon-rgb.svg) <!-- .element: style="width: 40%; float: left; margin: 0 -25px 0 -60px;" -->
39+
![](150_gitlab/media/gitlab-icon-rgb.svg) <!-- .element: style="width: 30%; float: left; margin: 0 -25px 0 -60px;" -->
4040

4141
# GitLab Ops
4242

43-
*Nicholas Dille, Haufe Group*
43+
*Nicholas Dille*
4444

45-
<i class="fa-brands fa-docker" style="width: 1.5em; text-align: center;"></i> Docker Captain
46-
47-
<i class="fa-brands fa-x-twitter" style="width: 1.5em; text-align: center;"></i> [@nicholasdille](https://twitter.com/nicholasdille)
45+
<i class="fa fa-briefcase" style="width: 1.5em; text-align: center;"></i>Haufe Group
4846

49-
<i class="fa-brands fa-mastodon" style="width: 1.5em; text-align: center;"></i> [@[email protected]](https://freiburg.social/@nicholasdille)
47+
<i class="fa-brands fa-docker" style="width: 1.5em; text-align: center;"></i> Docker Captain
5048
</textarea></section>
5149

5250
<section data-markdown="000_introduction/02_bio.md" data-separator="^---$" data-separator-vertical="^--$"></section>
@@ -94,7 +92,6 @@
9492

9593
```bash
9694
docker version
97-
sudo -l
9895
git clone https://github.com/nicholasdille/container-slides
9996
```
10097

@@ -108,7 +105,7 @@
108105

109106
### Part 2 - Configuration
110107

111-
[Omnibus](#/gitlab_omnibus) - [Reverse Proxy](#/gitlab_traefik) - [Directories](#/gitlab_directories) - [LDAP](#/gitlab_ldap) - [SMTP](#/gitlab_smtp) - [Registries](#/gitlab_registries) - [Integrations](#/gitlab_integrations) - [Troubleshooting](#/gitlab_troubleshooting) - [Update](#/gitlab_update) - [Runner](#/gitlab_runner) - [Pages](#/gitlab_pages) - [Monitoring](#/gitlab_monitoring) - [Resources](#/gitlab_components) - [Storage](#/gitlab_storage) - [Database](#/gitlab_database)
108+
[Omnibus](#/gitlab_omnibus) - [Reverse Proxy](#/gitlab_omnibus) - [Directories](#/gitlab_directories) - [LDAP](#/gitlab_ldap) - [SMTP](#/gitlab_smtp) - [Registries](#/gitlab_registries) - [Integrations](#/gitlab_integrations) - [Troubleshooting](#/gitlab_troubleshooting) - [Update](#/gitlab_update) - [Runner](#/gitlab_runner) - [Pages](#/gitlab_pages) - [Monitoring](#/gitlab_monitoring) - [Resources](#/gitlab_components) - [Storage](#/gitlab_storage) - [Database](#/gitlab_database)
112109
</textarea></section>
113110

114111
<section data-markdown="150_gitlab/000_intro/product.md" data-separator="^---$" data-separator-vertical="^--$"></section>

2023-11-23_heise-GitLab-Ops.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# GitLab Ops
2+
3+
Neue UI 16
4+
5+
Tabelle für Tokens
6+
7+
User Preferences - Auth Log
8+
9+
Vorinstallation glab
10+
11+
Messages in git response?!
12+
https://docs.gitlab.com/ee/administration/broadcast_messages.html
13+
14+
Repo housekeeping fewer options
15+
16+
runne
17+
18+
2023-11-07
19+
20+
https://micro.dev/

0 commit comments

Comments
 (0)