Improve CRD generation

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  architect: giantswarm/architect@0.8.8
+  architect: giantswarm/architect@0.8.9
 
 workflows:
   workflow:

.gitignore

@@ -0,0 +1 @@
+scripts/bin

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Add pod field to AWSCluster.
 - Replace custom `time.Time` wrapper `DeepCopyTime` with Kubernetes built-in `metav1.Time`.
 - Update `architect-orb` to `v0.8.8`.
 

apiextensions.go

@@ -0,0 +1,4 @@
+package apiextensions
+
+// This root package is currently required for pkger to read child directories.
+// Please do not remove.

config/crd/bases/application.giantswarm.io_appcatalogs.yaml

@@ -0,0 +1,122 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
+  name: appcatalogs.application.giantswarm.io
+spec:
+  group: application.giantswarm.io
+  names:
+    kind: AppCatalog
+    listKind: AppCatalogList
+    plural: appcatalogs
+    singular: appcatalog
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            config:
+              description: Config is the config to be applied when apps belonging
+                to this catalog are deployed.
+              properties:
+                configMap:
+                  description: ConfigMap references a config map containing catalog
+                    values that should be applied to apps in this catalog.
+                  properties:
+                    name:
+                      description: Name is the name of the config map containing catalog
+                        values to apply, e.g. app-catalog-values.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the catalog values
+                        config map, e.g. giantswarm.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                secret:
+                  description: Secret references a secret containing catalog values
+                    that should be applied to apps in this catalog.
+                  properties:
+                    name:
+                      description: Name is the name of the secret containing catalog
+                        values to apply, e.g. app-catalog-secret.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the secret, e.g.
+                        giantswarm.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+              required:
+              - configMap
+              - secret
+              type: object
+            description:
+              type: string
+            logoURL:
+              description: LogoURL contains the links for logo image file for this
+                app catalog
+              type: string
+            storage:
+              description: Storage references a map containing values that should
+                be applied to the appcatalog.
+              properties:
+                URL:
+                  description: URL is the link to where this AppCatalog's repository
+                    is located e.g. https://giantswarm.github.com/app-catalog/.
+                  type: string
+                type:
+                  description: Type indicates which repository type would be used
+                    for this AppCatalog. e.g. helm
+                  type: string
+              required:
+              - URL
+              - type
+              type: object
+            title:
+              description: Title is the name of the app catalog for this CR e.g. Catalog
+                of Apps by Giant Swarm
+              type: string
+          required:
+          - config
+          - description
+          - logoURL
+          - storage
+          - title
+          type: object
+      required:
+      - metadata
+      - spec
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/application.giantswarm.io_apps.yaml

@@ -0,0 +1,228 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
+  name: apps.application.giantswarm.io
+spec:
+  group: application.giantswarm.io
+  names:
+    kind: App
+    listKind: AppList
+    plural: apps
+    singular: app
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            catalog:
+              description: Catalog is the name of the app catalog this app belongs
+                to. e.g. giantswarm
+              type: string
+            config:
+              description: Config is the config to be applied when the app is deployed.
+              properties:
+                configMap:
+                  description: ConfigMap references a config map containing values
+                    that should be applied to the app.
+                  properties:
+                    name:
+                      description: Name is the name of the config map containing app
+                        values to apply, e.g. prometheus-values.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the values config
+                        map, e.g. monitoring.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                secret:
+                  description: Secret references a secret containing secret values
+                    that should be applied to the app.
+                  properties:
+                    name:
+                      description: Name is the name of the secret containing app values
+                        to apply, e.g. prometheus-secret.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the secret, e.g.
+                        kube-system.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+              required:
+              - configMap
+              - secret
+              type: object
+            kubeConfig:
+              description: KubeConfig is the kubeconfig to connect to the cluster
+                when deploying the app.
+              properties:
+                context:
+                  description: Context is the kubeconfig context.
+                  properties:
+                    name:
+                      description: Name is the name of the kubeconfig context. e.g.
+                        giantswarm-12345.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                inCluster:
+                  description: InCluster is a flag for whether to use InCluster credentials.
+                    When true the context name and secret should not be set.
+                  type: boolean
+                secret:
+                  description: Secret references a secret containing the kubconfig.
+                  properties:
+                    name:
+                      description: Name is the name of the secret containing the kubeconfig,
+                        e.g. app-operator-kubeconfig.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the secret containing
+                        the kubeconfig, e.g. giantswarm.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+              required:
+              - context
+              - inCluster
+              - secret
+              type: object
+            name:
+              description: Name is the name of the app to be deployed. e.g. kubernetes-prometheus
+              type: string
+            namespace:
+              description: Namespace is the namespace where the app should be deployed.
+                e.g. monitoring
+              type: string
+            userConfig:
+              description: UserConfig is the user config to be applied when the app
+                is deployed.
+              properties:
+                configMap:
+                  description: ConfigMap references a config map containing user values
+                    that should be applied to the app.
+                  properties:
+                    name:
+                      description: Name is the name of the config map containing user
+                        values to apply, e.g. prometheus-user-values.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the user values config
+                        map on the control plane, e.g. 123ab.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                secret:
+                  description: Secret references a secret containing user secret values
+                    that should be applied to the app.
+                  properties:
+                    name:
+                      description: Name is the name of the secret containing user
+                        values to apply, e.g. prometheus-user-secret.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the secret, e.g.
+                        kube-system.
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+              required:
+              - configMap
+              - secret
+              type: object
+            version:
+              description: Version is the version of the app that should be deployed.
+                e.g. 1.0.0
+              type: string
+          required:
+          - catalog
+          - config
+          - kubeConfig
+          - name
+          - namespace
+          - userConfig
+          - version
+          type: object
+        status:
+          properties:
+            appVersion:
+              description: AppVersion is the value of the AppVersion field in the
+                Chart.yaml of the deployed app. This is an optional field with the
+                version of the component being deployed. e.g. 0.21.0. https://docs.helm.sh/developing_charts/#the-chart-yaml-file
+              type: string
+            release:
+              description: Release is the status of the Helm release for the deployed
+                app.
+              properties:
+                lastDeployed:
+                  description: LastDeployed is the time when the app was last deployed.
+                  format: date-time
+                  type: string
+                reason:
+                  description: Reason is the description of the last status of helm
+                    release when the app is not installed successfully, e.g. deploy
+                    resource already exists.
+                  type: string
+                status:
+                  description: Status is the status of the deployed app, e.g. DEPLOYED.
+                  type: string
+              required:
+              - lastDeployed
+              - status
+              type: object
+            version:
+              description: Version is the value of the Version field in the Chart.yaml
+                of the deployed app. e.g. 1.0.0.
+              type: string
+          required:
+          - appVersion
+          - release
+          - version
+          type: object
+      required:
+      - metadata
+      - spec
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []