From 7a5ceb9f18523ef6b99895ae15ae82f15f21ab54 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Thu, 11 May 2023 21:06:07 +0200 Subject: [PATCH] update --- .../gitops/application-onboarding.md | 4 +- .../gitops/environments.md | 2 +- .../for-delivery-engineers/gitops/github.md | 2 - content/legal-documents/pp.md | 54 +++++++++++++++++++ mkdocs.yml | 8 ++- 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/content/for-delivery-engineers/gitops/application-onboarding.md b/content/for-delivery-engineers/gitops/application-onboarding.md index 4dfc4ec0..77283246 100644 --- a/content/for-delivery-engineers/gitops/application-onboarding.md +++ b/content/for-delivery-engineers/gitops/application-onboarding.md @@ -27,8 +27,8 @@ In this section, we will use [`stakater-nordmart-review-ui`](https://github.com/ ## Prerequisites -- `tenant` for application must be defined via `infra-gitops-config` [See GitOps Onboarding](gitops-onboarding.md) -- `tenant` for application should be onboarded onto `apps-gitops-config` [See GitOps Onboarding](gitops-onboarding.md) +- `tenant` for application must be defined via `infra-gitops-config` +- `tenant` for application should be onboarded onto `apps-gitops-config` - [helm](https://helm.sh/docs/intro/install/) - [git](https://git-scm.com/downloads) - [oc](https://docs.openshift.com/container-platform/4.11/cli_reference/openshift_cli/getting-started-cli.html) diff --git a/content/for-delivery-engineers/gitops/environments.md b/content/for-delivery-engineers/gitops/environments.md index 52a7c674..e89218d1 100644 --- a/content/for-delivery-engineers/gitops/environments.md +++ b/content/for-delivery-engineers/gitops/environments.md @@ -127,7 +127,7 @@ Lets see how can we add an environment to an application in a tenant. Lets say, To promote application from one environment to another; as mentioned above you will need to bump chart version and image tag version in that environment. You can do so by picking these versions from previous environment. -This guide assumes that application is already [on-boarded](../../for-developers/onboarding/application-onboarding.md) to different environments. +This guide assumes that application is already [on-boarded](application-onboarding.md) to different environments. ### 1. Promote chart diff --git a/content/for-delivery-engineers/gitops/github.md b/content/for-delivery-engineers/gitops/github.md index b49c67d6..acf8dc73 100644 --- a/content/for-delivery-engineers/gitops/github.md +++ b/content/for-delivery-engineers/gitops/github.md @@ -8,5 +8,3 @@ - Add the Stakater bot user as collaborator with `Admin` permissions (ask Stakater team about the bot user id); `Settings > Manage access > Invite people or team` ![grant-admin-access](./images/grant-admin-access.png) - -For more about bot account permissions. [Read here](../gitops/bot-account.md) diff --git a/content/legal-documents/pp.md b/content/legal-documents/pp.md index 0557a91b..a6638482 100644 --- a/content/legal-documents/pp.md +++ b/content/legal-documents/pp.md @@ -1 +1,55 @@ # Privacy Policy + +1. **Data Protection** + + Stakater AB (hereinafter referred to as STAKATER) remains committed to protection of your personal data, treat it with confidentially, and in compliance with the applicable data protection regulations and this Privacy Policy. + + This Privacy Policy outlines how STAKATER collects, uses, and shares personal data, as well as the options available to you regarding that data. You consent to the collection, use, and disclosure of your information in accordance with this Privacy Policy. + +1. **About Us** + + 1. **The Privacy Controller** + + STAKATER, located at `David Bagares gata 26A, 111 38 Stockholm, Sweden`, is the Privacy Controller. + + 1. **The Data Protection Officer** + + The Data Protection Officer is an authorized representative of STAKATER who can be contacted at any time in case of questions or suggestions regarding data protection. + + Contact details: privacy[AT]stakater.com + +1. **Personal Data Collection** + + When you provide STAKATER with your personal data, it is not shared with third parties without your express permission. Moreover, the data STAKATER collects includes, name, email, contact number, organization and your requirements or feedback. This along with any additional data may be used primarily for below purposes with your consent: + + - To provide you with news, events, offering updates, special offers, newsletters, and general information about STAKATER's offerings + - To analyze, improve, personalize, and monitor communications with interested and potential customers + - To provide you up-to-date services and customer support + +1. **Data Retention** + + STAKATER will only keep your personal data for the duration that is required to fulfill the purposes outlined in this Privacy Policy and to comply with STAKATER's legal obligations. Additionally, STAKATER may keep your personal data for the purpose of resolving disputes and enforcing STAKATER's legal agreements and policies. + +1. **Disclosure of Data** + + STAKATER may disclose your personal data in the good faith and belief that such action is necessary to comply with STAKATER's professional legal obligations required by law or in response to valid requests by public authorities including court or government. The purpose of such disclosure is primarily limited to prevent or inspect possible misconduct. + +1. **Security of Data** + + STAKATER uses reasonable technical and organizational measures to protect your data and continuously update them to meet technological advancements. STAKATER's staff and service providers adhere to data protection laws and access personal data only for necessary tasks. While STAKATER strives to protect your data, STAKATER cannot guarantee absolute security and advise taking appropriated security measures including use of antivirus software and firewalls to secure your communication, devices and systems. + +1. **Right to Withdraw Consent** + + If you gave consent for STAKATER to collect and use your personal data, you can withdraw your consent. STAKATER will stop processing your information for the purpose you originally consented to, unless there is another legal basis for processing. + +1. **Complaint Against Unlawful Use of Data** + + You have the right to solicit to a data protection authority if you believe that the processing of your personal data violates data protection laws you consented for. + +1. **Internet and Website Activity** + + When you access STAKATER's website, it collects and stores information in server log files, including browser type and version, operating system, referrer URL, host name of the accessing computer, and time of the server request. This data cannot be associated with a particular individual. STAKATER reserves the right to retrospectively check this data if STAKATER receives evidence of unlawful use. + +1. **Changes to STAKATER's Privacy Policy** + + STAKATER may change this privacy policy at any time and will publish any updates though appropriate and applicable ways. It is your responsibility to stay informed of the latest version and STAKATER recommends checking it regularly. diff --git a/mkdocs.yml b/mkdocs.yml index 21d31ed9..38fb27c7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,9 +4,9 @@ site_url: https://docs.stakater.com/saap/ repo_url: https://github.com/stakater/saap-docs edit_uri: blob/main/content/ use_directory_urls: false +strict: true theme: name: material - prev_next_buttons_location: none logo: assets/images/favicon.svg favicon: assets/images/favicon.svg custom_dir: custom_theme/ @@ -107,8 +107,11 @@ nav: - for-delivery-engineers/gitops/gitops-argocd-secrets.md - for-delivery-engineers/gitops/application-onboarding.md - for-delivery-engineers/gitops/environments.md + - for-delivery-engineers/gitops/github.md + - for-delivery-engineers/gitops/gitlab.md - for-delivery-engineers/gitops/faq.md - Continous Integration: + - for-delivery-engineers/ci-pipelines/secrets.md - Tekton: - for-delivery-engineers/ci-pipelines/tekton/intro.md - for-delivery-engineers/ci-pipelines/tekton/bot-account.md @@ -120,10 +123,12 @@ nav: - For Developers: - Overview: - for-developers/overview.md + - for-developers/develop-your-application.md - for-developers/access-your-cluster.md - for-developers/explore-argocd-vault-nexus.md - for-developers/plan-your-deployment.md - for-developers/requirements-for-next-section.md + - for-developers/help.md - Deploy your App: - for-developers/containerize-the-application.md - for-developers/package-the-application.md @@ -142,7 +147,6 @@ nav: - for-developers/add-grafana-dashboard-for-your-application.md - Onboarding: - for-developers/onboarding/tenant-onboarding.md - - for-developers/onboarding/application-onboarding.md - for-developers/onboarding/environment-onboarding.md - for-developers/onboarding/developer-training.md - for-developers/onboarding/secrets.md