From 6e6a48658efa738fdfbd6da0b4859ebd9f14a41d Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 3 Feb 2025 20:29:54 +0100 Subject: [PATCH 1/3] example environment promotion --- demo/environment_promotion.md | 65 +++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 demo/environment_promotion.md diff --git a/demo/environment_promotion.md b/demo/environment_promotion.md new file mode 100644 index 000000000..cfcd607a9 --- /dev/null +++ b/demo/environment_promotion.md @@ -0,0 +1,65 @@ +# notes on environment promotion + +```yaml +--- +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: example-app-set + namespace: argocd + annotations: + argocd.argoproj.io/sync-wave: "4" +spec: + # enable go templating + goTemplate: true + + # this generator allows us to values from an external k8s secret + generators: + + # dev environment + - clusters: + selector: + matchLabels: + environment: "dev" + # values to be templated into the Argo CD application + values: + # gets updated on push to main + version: 0.2.0 + + # prod environment + - clusters: + selector: + matchLabels: + environment: "prod" + # values to be templated into the Argo CD application + values: + # gets updated after user clicks approve button after main is successfully rolled out + version: 0.1.0 + + template: + metadata: + name: example-web-app + annotations: + argocd.argoproj.io/sync-wave: "4" + argocd.argoproj.io/sync-options: ApplyOnly=true + spec: + project: example + # where the app is going + destination: + server: https://kubernetes.default.svc + namespace: example + # reconciliation policy + syncPolicy: + syncOptions: + - ApplyOutOfSyncOnly=true + automated: + prune: true + selfHeal: true + # where the is coming from + source: + repoURL: https://small-hack.github.io/example-chart + targetRevision: "{{ .values.version }}" + chart: example + helm: + releaseName: "my-app-{{ .metadata.labels.environment }}" +``` From 7d4dea50554369673bf7a358d36bcda6244fdfe7 Mon Sep 17 00:00:00 2001 From: Jesse Hitch Date: Mon, 3 Feb 2025 20:38:30 +0100 Subject: [PATCH 2/3] Update environment_promotion.md -clean up example --- demo/environment_promotion.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/demo/environment_promotion.md b/demo/environment_promotion.md index cfcd607a9..835fb351d 100644 --- a/demo/environment_promotion.md +++ b/demo/environment_promotion.md @@ -16,6 +16,17 @@ spec: # this generator allows us to values from an external k8s secret generators: + # local environment + - clusters: + selector: + matchLabels: + environment: "jesse-local" + # values to be templated into the Argo CD application + values: + # gets updated on push to main + version: 0.2.0 + namespace: test + # dev environment - clusters: selector: @@ -24,7 +35,8 @@ spec: # values to be templated into the Argo CD application values: # gets updated on push to main - version: 0.2.0 + version: 0.1.0 + namespace: main # prod environment - clusters: @@ -35,19 +47,20 @@ spec: values: # gets updated after user clicks approve button after main is successfully rolled out version: 0.1.0 + namespace: main template: metadata: name: example-web-app - annotations: - argocd.argoproj.io/sync-wave: "4" - argocd.argoproj.io/sync-options: ApplyOnly=true + spec: project: example + # where the app is going destination: - server: https://kubernetes.default.svc + server: "{{ .server }}" namespace: example + # reconciliation policy syncPolicy: syncOptions: From f3e002023573e78c4a34a2e9c2c3f63de46c46ae Mon Sep 17 00:00:00 2001 From: jessebot Date: Fri, 7 Feb 2025 18:27:16 +0100 Subject: [PATCH 3/3] update spacechalk theme for mastodon profile label headers --- mastodon/small-hack/spacechalk_theme.css | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/mastodon/small-hack/spacechalk_theme.css b/mastodon/small-hack/spacechalk_theme.css index 23740a911..4ccf285c3 100644 --- a/mastodon/small-hack/spacechalk_theme.css +++ b/mastodon/small-hack/spacechalk_theme.css @@ -56,7 +56,7 @@ --textPageBold: #7aa2f7; --textPageMuted: #f6f76a; ---bgHead: #323232; +--bgHead: #292938; --textHead: #5cc9fd; --accent: #fdcd36; --accentText: #ffd147; @@ -91,6 +91,7 @@ transform: scale(2); transition: all 0.2s ease; position: absolute; + background-color: var(--bg); } /*------------------------------------------------------------------------------ @@ -132,6 +133,16 @@ color: var(--textBold) !important; } +/*------------------------------------------ +* profile headers should be purple +--------------------------------------------*/ + +.account__header__bio .account__header__fields dt { + color: #927bff !important; + text-transform: uppercase; + width: auto; +} + /*------------------------------------------ *  followers icon should always be yellow --------------------------------------------*/ @@ -148,9 +159,9 @@ color: #f289f9 !important; } -/*----------------------------------------- -* 󰗊 translate icon should always be white -------------------------------------------*/ +/*------------------------------------ +* 󰗊 translate should always be white +--------------------------------------*/ .dropdown-button .icon-undefined { color: var(--text) !important; } @@ -170,7 +181,7 @@ } /*--------------------------------------------- -* compose new toot form and search bar +* compose form for new toot and search bar -----------------------------------------------*/ .autosuggest-textarea__textarea::placeholder, .search__input::placeholder { color: var(--textPageBold) !important; @@ -180,7 +191,7 @@ * make the profile banner a decent size * -----------------------------------------*/ .account__header__image { - height: 250px; + height: 225px; } .account__header__bar {