Merge pull request #2 from Adeesh-devanand/patch-3

Patch 3
gopaddle-io · Oct 29, 2021 · 7fa36c8 · 7fa36c8
2 parents 0084fdf + 5f4c591
commit 7fa36c8
Show file tree

Hide file tree

Showing 15 changed files with 204 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ main
 configurator
 .history
 .vscode
+.idea
diff --git 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 <namespace>
 3. Ensure the README is updated with any interface or architecture changes.
 
 ## Maintainers
-Congurator is maintained by [gopaddle.io](https://gopaddle.io) team.
+Congurator is maintained by [gopaddle.io](https://gopaddle.io) team.
diff --git a/deploy/crd-customConfigMap.yaml b/deploy/crd-customConfigMap.yaml
@@ -1,14 +1,38 @@
-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
     singular: customconfigmap
     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
@@ -1,14 +1,43 @@
-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
     singular: customsecret
     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/docs/_contribute/meetings/2021-10-06.md 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
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/mGZ339cT8gM" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+### Agenda
+* Review Configurator Architecture
diff --git a/docs/_contribute/meetings/2021-10-13.md 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
diff --git a/docs/_contribute/meetings/2021-10-20.md 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
+* Architecture Revamp
diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
@@ -47,11 +47,18 @@ 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/
       - title: "2021-09-29"
         url: /contribute/meetings/2021-09-29/
       - title: "2021-09-22"
         url: /contribute/meetings/2021-09-22/
       - title: "2021-09-15"
         url: /contribute/meetings/2021-09-15/
       - title: "2021-09-08"
-        url: /contribute/meetings/2021-09-08/
+        url: /contribute/meetings/2021-09-08/
+
diff --git a/docs/_pages/home.md b/docs/_pages/home.md
@@ -7,7 +7,7 @@ header:
   overlay_image: /assets/images/home-bg.jpg
   actions:
     - label: "<i class='fas fa-download'></i> 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<br />
   <small><a href="https://github.com/gopaddle-io/configurator/releases/tag/v0.0.1">Latest release v.0.0.1</a></small>
@@ -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

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/helm/index.yaml b/helm/index.yaml
@@ -3,7 +3,17 @@ entries:
   configurator:
   - apiVersion: v2
     appVersion: latest
-    created: "2021-09-13T23:49:07.831287291-03:00"
+    created: "2021-10-22T08:32:23.349059654-03:00"
+    description: Helm chart for installing configurator CRDs & Custom Controller
+    digest: c5b81a2a13e6711770577fff323d0a8b974f8f76029f68c96ee20d756ca1140f
+    name: configurator
+    type: application
+    urls:
+    - configurator-0.3.0-alpha.tgz
+    version: 0.3.0-alpha
+  - apiVersion: v2
+    appVersion: latest
+    created: "2021-10-22T08:32:23.348812336-03:00"
     description: Helm chart for installing configurator CRDs & Custom Controller
     digest: e4a5fc080a5843b69dee563b09f1910493b51bdc5640296c0541aa12b454501c
     name: configurator
@@ -13,12 +23,12 @@ entries:
     version: 0.2.0-alpha
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-09-13T23:49:07.831073576-03:00"
+    created: "2021-10-22T08:32:23.348347273-03:00"
     description: Helm chart for installing configurator CRDs & Custom Controller
     digest: 63d1fa4baf7a2c04e568b6a332d7f019cae3a4e6190b063b7a1f85eac8c966e4
     name: configurator
     type: application
     urls:
     - configurator-0.1.0.tgz
     version: 0.1.0
-generated: "2021-09-13T23:49:07.830673546-03:00"
+generated: "2021-10-22T08:32:23.34775123-03:00"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ main @@
     configurator
     .history
     .vscode
+    .idea