8
0
Fork
You've already forked gitops
0

docs: Add documentation on rotating secrets encrypted with sops #27

Open
drGrove wants to merge 1 commit from docs/removing-admins into master
pull from: docs/removing-admins
merge into: hashbang-sh:master
hashbang-sh:master
hashbang-sh:renovate/redis-7.x
hashbang-sh:renovate/quay.io-keycloak-keycloak-25.x
hashbang-sh:renovate/postgrest-postgrest-12.x
hashbang-sh:renovate/kiwigrid-k8s-sidecar-1.x
hashbang-sh:renovate/quay.io-argoproj-argocd-2.x
hashbang-sh:renovate/argoproj-argo-cd-2.x
hashbang-sh:renovate/cert-manager-1.x
hashbang-sh:renovate/quay.io-keycloak-keycloak-24.x
hashbang-sh:renovate/ghcr.io-dexidp-dex-2.x
hashbang-sh:renovate/registry.k8s.io-external-dns-external-dns-0.x
hashbang-sh:jitsi
hashbang-sh:argocd/openpgp-signatures
hashbang-sh:drgrove/openpgp-ca
hashbang-sh:ingress-nginx
hashbang-sh:add-lrvick
hashbang-sh:gpg-signed
hashbang-sh:persist-prometheus-timeseries
hashbang-sh:argocd-deploy-gpg-pub-key
hashbang-sh:drgrove/loki-logging
hashbang-sh:drGrove/nginx-ingress-helm-stable
hashbang-sh:nginx-ingress-proxy-protocol
hashbang-sh:ingress-is-messed-up
drGrove commented 2020年06月08日 19:51:57 +02:00 (Migrated from github.com)
Copy link
No description provided.
daurnimator commented 2020年06月09日 01:40:57 +02:00 (Migrated from github.com)
Copy link

more to do, e.g. remove from argocd users.

more to do, e.g. remove from argocd users.
drGrove commented 2020年10月07日 06:52:07 +02:00 (Migrated from github.com)
Copy link

more to do, e.g. remove from argocd users.

What do you mean?

> more to do, e.g. remove from argocd users. What do you mean?
daurnimator commented 2020年10月07日 08:49:39 +02:00 (Migrated from github.com)
Copy link

more to do, e.g. remove from argocd users.

What do you mean?

They need to also e.g. be removed from argocd/users.patch.yaml
==> the whole on boarding process needs to be reversed.

> > more to do, e.g. remove from argocd users. > > What do you mean? They need to also e.g. be removed from argocd/users.patch.yaml ==> the whole on boarding process needs to be reversed.
This pull request has changes conflicting with the target branch.
  • README.md
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin docs/removing-admins:docs/removing-admins
git switch docs/removing-admins

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff docs/removing-admins
git switch docs/removing-admins
git rebase master
git switch master
git merge --ff-only docs/removing-admins
git switch docs/removing-admins
git rebase master
git switch master
git merge --no-ff docs/removing-admins
git switch master
git merge --squash docs/removing-admins
git switch master
git merge --ff-only docs/removing-admins
git switch master
git merge docs/removing-admins
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
hashbang-sh/gitops!27
Reference in a new issue
hashbang-sh/gitops
No description provided.
Delete branch "docs/removing-admins"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?