From 59f0577a46894ad228b172acfc4fd0a9f5830b72 Mon Sep 17 00:00:00 2001 From: gopaddle <74309181+gopaddle-io@users.noreply.github.com> Date: Thu, 30 Sep 2021 12:42:36 +0530 Subject: [PATCH 01/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a1ffdbe..31f8807 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ In order to keep the deployments and statefulsets in sync with the ConfigMap and # Contributing Check the [CONTRIBUTING.md](/CONTRIBUTING.md) file to start contributing to the project -Check out the [Configurator website](https://localhost:4000) for quick and easy navigation of all documentaion and additional resources. +Check out the [Configurator website](https://gopaddle-io.github.io/configurator/) for quick and easy navigation of all documentaion and additional resources. Join the community at our [discord server]((https://discord.gg/dr24Z4BmP8)) @@ -131,4 +131,4 @@ kubectl delete ccs -n 3. Ensure the README is updated with any interface or architecture changes. ## Maintainers -Congurator is maintained by [gopaddle.io](https://gopaddle.io) team. \ No newline at end of file +Congurator is maintained by [gopaddle.io](https://gopaddle.io) team. From 2067ebfcf6a0ec21f131017dbcfb511346d2fc4f Mon Sep 17 00:00:00 2001 From: gopaddle <74309181+gopaddle-io@users.noreply.github.com> Date: Thu, 30 Sep 2021 13:16:10 +0530 Subject: [PATCH 02/13] Update home.md --- docs/_pages/home.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_pages/home.md b/docs/_pages/home.md index aa00bde..c34cd47 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -7,7 +7,7 @@ header: overlay_image: /assets/images/home-bg.jpg actions: - label: " Install now" - url: "/Quick-Start-Guide/" + url: "https://github.com/gopaddle-io/configurator/raw/main/helm/configurator-0.1.0.tgz" excerpt: > Never let a ConfigMap update break your Kubernetes deployment
Latest release v.0.0.1 @@ -16,7 +16,7 @@ feature_row1: alt: "Github repo" title: "Github project repo" excerpt: "Visit the project repository to clone, fork, customize the project…" - url: "/docs/layouts/" + url: "https://github.com/gopaddle-io/configurator" btn_class: "btn--primary" btn_label: "Repo Link" - image_path: /assets/images/discord.png From 1e4f0d14216fdcf3fa304bbeb50791d15917054e Mon Sep 17 00:00:00 2001 From: gopaddle <74309181+gopaddle-io@users.noreply.github.com> Date: Thu, 30 Sep 2021 13:33:15 +0530 Subject: [PATCH 03/13] Added video embed for 29th Sept --- docs/_contribute/meetings/2021-09-29.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_contribute/meetings/2021-09-29.md b/docs/_contribute/meetings/2021-09-29.md index 0cc7714..088c19f 100644 --- a/docs/_contribute/meetings/2021-09-29.md +++ b/docs/_contribute/meetings/2021-09-29.md @@ -12,7 +12,7 @@ sidebar: ## 29th September 2021 -{% include video id="kPCndHfltGY" provider="youtube" %} + ### Agenda * Review Configurator website From 0cfcc9c2bc396f33e204349d750704f7c038da20 Mon Sep 17 00:00:00 2001 From: gopaddle <74309181+gopaddle-io@users.noreply.github.com> Date: Wed, 6 Oct 2021 21:51:43 +0530 Subject: [PATCH 04/13] Create 2021-10-06.md Configurator Community Meeting - 6th Oct '21 --- docs/_contribute/meetings/2021-10-06.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 docs/_contribute/meetings/2021-10-06.md diff --git a/docs/_contribute/meetings/2021-10-06.md b/docs/_contribute/meetings/2021-10-06.md new file mode 100644 index 0000000..f48815c --- /dev/null +++ b/docs/_contribute/meetings/2021-10-06.md @@ -0,0 +1,18 @@ +--- +permalink: /contribute/meetings/2021-10-06/ +title: false +layout: single +read_time: false +author_profile: false +share: false +comments: false +sidebar: + nav: "contribute" +--- + +## 6th October 2021 + + + +### Agenda +* Review Configurator website From 2a8a9f97e25e5e8682a51f70bb4c2168a9b4a09f Mon Sep 17 00:00:00 2001 From: gopaddle <74309181+gopaddle-io@users.noreply.github.com> Date: Wed, 6 Oct 2021 21:53:40 +0530 Subject: [PATCH 05/13] Update 2021-10-06.md Changed the meeting agenda --- docs/_contribute/meetings/2021-10-06.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_contribute/meetings/2021-10-06.md b/docs/_contribute/meetings/2021-10-06.md index f48815c..643dd8d 100644 --- a/docs/_contribute/meetings/2021-10-06.md +++ b/docs/_contribute/meetings/2021-10-06.md @@ -15,4 +15,4 @@ sidebar: ### Agenda -* Review Configurator website +* Review Configurator Architecture From e5634b26b82289c0d5d8a8f2be17976234cc28c8 Mon Sep 17 00:00:00 2001 From: Adeesh Devanand Date: Wed, 6 Oct 2021 23:03:52 +0530 Subject: [PATCH 06/13] Added meeting for 6th Oct --- docs/_data/navigation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml index db3290d..6131433 100644 --- a/docs/_data/navigation.yml +++ b/docs/_data/navigation.yml @@ -54,4 +54,6 @@ contribute: - title: "2021-09-15" url: /contribute/meetings/2021-09-15/ - title: "2021-09-08" - url: /contribute/meetings/2021-09-08/ \ No newline at end of file + url: /contribute/meetings/2021-09-08/ + - title: "2021-10-06" + url: /contribute/meetings/2021-10-06/ From 7239540cb519fe9c4182de16f6514cb278c7b4e1 Mon Sep 17 00:00:00 2001 From: Adeesh Devanand Date: Wed, 6 Oct 2021 23:08:43 +0530 Subject: [PATCH 07/13] corrected order --- docs/_data/navigation.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml index 6131433..45c3bbc 100644 --- a/docs/_data/navigation.yml +++ b/docs/_data/navigation.yml @@ -47,6 +47,8 @@ contribute: url: /contribute/Code-Of-Conduct/ - title: "Weekly Meetings" children: + - title: "2021-10-06" + url: /contribute/meetings/2021-10-06/ - title: "2021-09-29" url: /contribute/meetings/2021-09-29/ - title: "2021-09-22" @@ -55,5 +57,4 @@ contribute: url: /contribute/meetings/2021-09-15/ - title: "2021-09-08" url: /contribute/meetings/2021-09-08/ - - title: "2021-10-06" - url: /contribute/meetings/2021-10-06/ + From 6835d2ddc719a7202bcb6ee6c85e24595d808895 Mon Sep 17 00:00:00 2001 From: Adeesh Devanand Date: Wed, 20 Oct 2021 18:34:23 +0530 Subject: [PATCH 08/13] Update navigation.yml --- docs/_data/navigation.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml index 45c3bbc..06aff84 100644 --- a/docs/_data/navigation.yml +++ b/docs/_data/navigation.yml @@ -47,8 +47,12 @@ contribute: url: /contribute/Code-Of-Conduct/ - title: "Weekly Meetings" children: + - title: "2021-10-20" + url: /contribute/meetings/2021-10-20/ + - title: "2021-10-13" + url: /contribute/meetings/2021-10-13/ - title: "2021-10-06" - url: /contribute/meetings/2021-10-06/ + url: /contribute/meetings/2021-10-06/ - title: "2021-09-29" url: /contribute/meetings/2021-09-29/ - title: "2021-09-22" From ec28b57ad4f15b190711ce7613b5bce20f4cbeeb Mon Sep 17 00:00:00 2001 From: Adeesh Devanand Date: Wed, 20 Oct 2021 18:40:28 +0530 Subject: [PATCH 09/13] Create 2021-10-20.md --- docs/_contribute/meetings/2021-10-20.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/_contribute/meetings/2021-10-20.md diff --git a/docs/_contribute/meetings/2021-10-20.md b/docs/_contribute/meetings/2021-10-20.md new file mode 100644 index 0000000..e7a9495 --- /dev/null +++ b/docs/_contribute/meetings/2021-10-20.md @@ -0,0 +1,21 @@ +--- +permalink: /contribute/meetings/2021-10-20/ +title: false +layout: single +read_time: false +author_profile: false +share: false +comments: false +sidebar: + nav: "contribute" +--- + +## 20th October 2021 + +Recording Currently Unavaiable + +### Agenda + +#### Review Issues +* #53 Support for CRD creation in K8s v1.22 +* #54 CustomSecret breaks the data format while creating Secrets From db17d59e47caf923f6e612f2135914761416d6ca Mon Sep 17 00:00:00 2001 From: Adeesh Devanand Date: Wed, 20 Oct 2021 18:40:54 +0530 Subject: [PATCH 10/13] Create 2021-10-13.md --- docs/_contribute/meetings/2021-10-13.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docs/_contribute/meetings/2021-10-13.md diff --git a/docs/_contribute/meetings/2021-10-13.md b/docs/_contribute/meetings/2021-10-13.md new file mode 100644 index 0000000..106d407 --- /dev/null +++ b/docs/_contribute/meetings/2021-10-13.md @@ -0,0 +1,15 @@ +--- +permalink: /contribute/meetings/2021-10-13/ +title: false +layout: single +read_time: false +author_profile: false +share: false +comments: false +sidebar: + nav: "contribute" +--- + +## 13th October 2021 + +Meeting Unavailable From 065a9d1f3a53438b08588cef8428f21b125064b4 Mon Sep 17 00:00:00 2001 From: gopaddle <74309181+gopaddle-io@users.noreply.github.com> Date: Wed, 20 Oct 2021 18:48:00 +0530 Subject: [PATCH 11/13] Update 2021-10-20.md --- docs/_contribute/meetings/2021-10-20.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/_contribute/meetings/2021-10-20.md b/docs/_contribute/meetings/2021-10-20.md index e7a9495..ec13fa0 100644 --- a/docs/_contribute/meetings/2021-10-20.md +++ b/docs/_contribute/meetings/2021-10-20.md @@ -15,7 +15,6 @@ sidebar: Recording Currently Unavaiable ### Agenda - #### Review Issues * #53 Support for CRD creation in K8s v1.22 * #54 CustomSecret breaks the data format while creating Secrets From ac83c356032ad722faca551e050f2ef1bc083cfd Mon Sep 17 00:00:00 2001 From: Julio Morimoto Date: Fri, 22 Oct 2021 08:33:29 -0300 Subject: [PATCH 12/13] Fix https://github.com/gopaddle-io/configurator/issues/53 Migrate CRDs to `apiextensions.k8s.io/v1`. This keeps the same api version for the current definition (v1alpha1), while making them compatible with Kubernetes 1.22+. `apiextensions.k8s.io/v1` was introduced in 1.16, so this should also keep everything backwards compatible with previous installations of Configurator. https://kubernetes.io/docs/reference/using-api/deprecation-guide/#customresourcedefinition-v122 --- .gitignore | 1 + deploy/crd-customConfigMap.yaml | 28 ++++++++++++- deploy/crd-customSecret.yaml | 33 ++++++++++++++- helm-src/configurator/CHANGELOG.md | 5 +++ helm-src/configurator/Chart.yaml | 2 +- .../templates/crds/crd-customConfigMap.yaml | 33 ++++++++++++--- .../templates/crds/crd-customSecret.yaml | 38 +++++++++++++++--- helm/configurator-0.3.0-alpha.tgz | Bin 0 -> 2143 bytes helm/index.yaml | 16 ++++++-- 9 files changed, 138 insertions(+), 18 deletions(-) create mode 100644 helm/configurator-0.3.0-alpha.tgz diff --git a/.gitignore b/.gitignore index 181c222..8750157 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ main configurator .history .vscode +.idea \ No newline at end of file diff --git a/deploy/crd-customConfigMap.yaml b/deploy/crd-customConfigMap.yaml index d4c4e85..b0a2858 100644 --- a/deploy/crd-customConfigMap.yaml +++ b/deploy/crd-customConfigMap.yaml @@ -1,10 +1,9 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: customconfigmaps.configurator.gopaddle.io spec: group: configurator.gopaddle.io - version: v1alpha1 names: kind: CustomConfigMap plural: customconfigmaps @@ -12,3 +11,28 @@ spec: shortNames: - ccm scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + properties: + configMapName: + type: string + data: + x-kubernetes-preserve-unknown-fields: true + type: object + binaryData: + x-kubernetes-preserve-unknown-fields: true + type: object diff --git a/deploy/crd-customSecret.yaml b/deploy/crd-customSecret.yaml index 1b84200..30aa985 100644 --- a/deploy/crd-customSecret.yaml +++ b/deploy/crd-customSecret.yaml @@ -1,10 +1,9 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: customsecrets.configurator.gopaddle.io spec: group: configurator.gopaddle.io - version: v1alpha1 names: kind: CustomSecret plural: customsecrets @@ -12,3 +11,33 @@ spec: shortNames: - ccs scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + properties: + secretName: + type: string + type: + type: string + data: + x-kubernetes-preserve-unknown-fields: true + type: object + stringData: + x-kubernetes-preserve-unknown-fields: true + type: object + secretAnnotations: + x-kubernetes-preserve-unknown-fields: true + type: object diff --git a/helm-src/configurator/CHANGELOG.md b/helm-src/configurator/CHANGELOG.md index 3370da5..020597f 100644 --- a/helm-src/configurator/CHANGELOG.md +++ b/helm-src/configurator/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for Configurator Helm Chart +## 0.3.0-alpha + +* Migrate CRDs to apiextensions.k8s.io/v1 in preparation for Kubernetes 1.22+ + https://github.com/gopaddle-io/configurator/issues/53 + ## 0.2.0-alpha * Prefix all resources with `.Release.Name` to avoid conflicts with a future support for multiple installations in the same cluster. diff --git a/helm-src/configurator/Chart.yaml b/helm-src/configurator/Chart.yaml index 64c3431..81c5d81 100644 --- a/helm-src/configurator/Chart.yaml +++ b/helm-src/configurator/Chart.yaml @@ -3,4 +3,4 @@ appVersion: latest description: Helm chart for installing configurator CRDs & Custom Controller name: configurator type: application -version: 0.2.0-alpha +version: 0.3.0-alpha diff --git a/helm-src/configurator/templates/crds/crd-customConfigMap.yaml b/helm-src/configurator/templates/crds/crd-customConfigMap.yaml index 5c63519..b512815 100644 --- a/helm-src/configurator/templates/crds/crd-customConfigMap.yaml +++ b/helm-src/configurator/templates/crds/crd-customConfigMap.yaml @@ -1,18 +1,41 @@ {{- if .Values.installCrds -}} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: customconfigmaps.configurator.gopaddle.io - annotations: - "helm.sh/resource-policy": keep spec: group: configurator.gopaddle.io - version: v1alpha1 names: kind: CustomConfigMap plural: customconfigmaps singular: customconfigmap shortNames: - - ccm + - ccm scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + properties: + configMapName: + type: string + data: + x-kubernetes-preserve-unknown-fields: true + type: object + binaryData: + x-kubernetes-preserve-unknown-fields: true + type: object + {{- end -}} diff --git a/helm-src/configurator/templates/crds/crd-customSecret.yaml b/helm-src/configurator/templates/crds/crd-customSecret.yaml index 36d21d6..907637b 100644 --- a/helm-src/configurator/templates/crds/crd-customSecret.yaml +++ b/helm-src/configurator/templates/crds/crd-customSecret.yaml @@ -1,18 +1,46 @@ {{- if .Values.installCrds -}} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: customsecrets.configurator.gopaddle.io - annotations: - "helm.sh/resource-policy": keep spec: group: configurator.gopaddle.io - version: v1alpha1 names: kind: CustomSecret plural: customsecrets singular: customsecret shortNames: - - ccs + - ccs scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + properties: + secretName: + type: string + type: + type: string + data: + x-kubernetes-preserve-unknown-fields: true + type: object + stringData: + x-kubernetes-preserve-unknown-fields: true + type: object + secretAnnotations: + x-kubernetes-preserve-unknown-fields: true + type: object + {{- end -}} diff --git a/helm/configurator-0.3.0-alpha.tgz b/helm/configurator-0.3.0-alpha.tgz new file mode 100644 index 0000000000000000000000000000000000000000..431ac889d168bedaf5ebabe8ab7173d5ca78c9b9 GIT binary patch literal 2143 zcmV-l2%z^LiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI^)bKAHP&NF_+)}HCKX+)8d6?gRJ%6GX;FFB9hW~NUSM6M{D zK>!6nIXa*E+iwVv5=qICowH@sX2@OLI-F)ZNjHY8xzQ#$P=q zg<%-JJvniI!!T_B4SR#=Rdf>dPX@hk5T3pYqyF2|-YW4{T0L@V(O8n8i8WK!wf%rRgSa>*FqImZFqU%8L<;qT1f$Dy1Am55 zZmi5;B!$(IbJRr842KO~ViyXBK$YSwro}8|UP%xJ{UGd6u4a@x_lx?2QbYgel;>z3 z-2m*;|H0c{OaD)z{@|eh`=C;TM>;V>usTOVSVmJE5&(@#8fK+l3?Y?@CJD!GLw5}EC> zn-Go8=9nQw#e9*8M21{Tg;T(g~l#-VxAj|T1$>!WgB+rfA92d*wp`CbQ(qn{oe=G{lA{jIH0+m zNzHz7t~j{nrx>K~}H_lA;^@iGbR(|(us0P#MA0A08|C@}eCzXt< za{LV`5>#9+G8Efh&1y)`$#M0tRWx;%XqC(llFV3Yahh|pb=USF+R@P+g57nJo>8VR z9ix5jVh8ZEMNwFrJGQlQ$@kaA-+z?i)%8TrrqlR&I^SrZSQuOJYuN6{Q)ZeKt(YM<1*4v-oy*mPd*G) zHA2A&V31>MrS`5aD}39Jbb`F}eb4~d%@|`%G6GPY@^YZs+6v;0G4DUBC#qB{yjiqX z%PhyUlnKvRxwmP^uvhio0b*^CUkgK}BA{BxW#!CW?X z(|WXHo57u-(F!=F{(|_05UMjb9*ETCSsh&0qj;_<-xR=uG$zuVQ@zpcduLKRWKx4| zahw&nG?og7urh23aWNUQj)iy1bU?;_Tx6 zr~Xx|1Hh-!rMv9bntejdvL;em6b?aq>>)yVnIP z*#3bkhbA|=zaVu%+oUe&b7!5z=qQbD3p=^E7V<`PrVRNije6INTUP=wVS?(#`IFB} z3WZ0JIPJc-{l9WS?XN8i*p>h5oow9y!{}iD_d?HS|I0+l6B>ViYPVSadXA=T_Rac7 z+iku%*!&l2^ZnL+mBDwNFW*aeL7v`AY|QK4>{&a>|5Veroz#Jzj2iwwm?6(tDx}88 zoMU(X@9jqYUwCrx|NEe0xS-ae7Or~F@4c_7o8*iqOr)S_d`(j{0V%8UOsFiX%5~N+v zr{&Kin44H8*!_lVR_|Wt~h=Nbzrj>kv3hwai-6 zyN$T1@Ng;kdrmF}R|9H|8Z8tMk~2Hm=p`yOl5z^E@e_m1A`4UezTR#<#3z z4jjk(jHc*{qCvTwpKt!2<7YN07U}veP2WILtL`3eBpJs}vJY~;J_p777_UMJluu_^M#6dYN>IYG!(s%cVrfpGyqs Date: Fri, 29 Oct 2021 20:08:42 +0530 Subject: [PATCH 13/13] Update 2021-10-20.md --- docs/_contribute/meetings/2021-10-20.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/_contribute/meetings/2021-10-20.md b/docs/_contribute/meetings/2021-10-20.md index ec13fa0..e9068c6 100644 --- a/docs/_contribute/meetings/2021-10-20.md +++ b/docs/_contribute/meetings/2021-10-20.md @@ -18,3 +18,4 @@ Recording Currently Unavaiable #### Review Issues * #53 Support for CRD creation in K8s v1.22 * #54 CustomSecret breaks the data format while creating Secrets +* Architecture Revamp