Merge pull request #404 from wansir/master

Bump ks-core from 0.4.0 to 1.1.0 in /src/main/ks-core

src/main/ks-core/Chart.yaml

@@ -7,9 +7,18 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 1.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "v4.0.0"
+appVersion: "v4.1.1"
+
+dependencies:
+  - name: redis-ha
+    version: 4.26.1
+    alias: redisHA
+    condition: redisHA.enabled
+  - name: ks-crds
+    version: 1.0.0
+    alias: ksCRDs

src/main/ks-core/charts/ks-crds/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

src/main/ks-core/charts/ks-crds/Chart.yaml

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: ks-crds
+description: A Helm chart for KS's CustomResourceDefinition
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 1.0.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "v4.1.0"

src/main/ks-core/charts/ks-crds/crds/application.kubesphere.io_applicationreleases.yaml

@@ -0,0 +1,115 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (unknown)
+  name: applicationreleases.application.kubesphere.io
+spec:
+  group: application.kubesphere.io
+  names:
+    kind: ApplicationRelease
+    listKind: ApplicationReleaseList
+    plural: applicationreleases
+    shortNames:
+    - apprls
+    singular: applicationrelease
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.labels.kubesphere\.io/workspace
+      name: workspace
+      type: string
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/app-id
+      name: app
+      type: string
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/appversion-id
+      name: appversion
+      type: string
+    - jsonPath: .spec.appType
+      name: appType
+      type: string
+    - jsonPath: .metadata.labels.kubesphere\.io/cluster
+      name: Cluster
+      type: string
+    - jsonPath: .metadata.labels.kubesphere\.io/namespace
+      name: Namespace
+      type: string
+    - jsonPath: .status.state
+      name: State
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v2
+    schema:
+      openAPIV3Schema:
+        description: ApplicationRelease is the Schema for the applicationreleases
+          API
+        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:
+            description: ApplicationReleaseSpec defines the desired state of ApplicationRelease
+            properties:
+              appID:
+                type: string
+              appType:
+                type: string
+              appVersionID:
+                type: string
+              values:
+                format: byte
+                type: string
+            required:
+            - appID
+            - appVersionID
+            type: object
+          status:
+            description: ApplicationReleaseStatus defines the observed state of ApplicationRelease
+            properties:
+              installJobName:
+                type: string
+              lastUpdate:
+                format: date-time
+                type: string
+              message:
+                type: string
+              realTimeResources:
+                items:
+                  description: |-
+                    RawMessage is a raw encoded JSON value.
+                    It implements Marshaler and Unmarshaler and can
+                    be used to delay JSON decoding or precompute a JSON encoding.
+                  format: byte
+                  type: string
+                type: array
+              specHash:
+                type: string
+              state:
+                type: string
+              uninstallJobName:
+                type: string
+            required:
+            - state
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

src/main/ks-core/charts/ks-crds/crds/application.kubesphere.io_applications.yaml

@@ -0,0 +1,107 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (unknown)
+  name: applications.application.kubesphere.io
+spec:
+  group: application.kubesphere.io
+  names:
+    kind: Application
+    listKind: ApplicationList
+    plural: applications
+    shortNames:
+    - app
+    singular: application
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/repo-name
+      name: repo
+      type: string
+    - jsonPath: .metadata.labels.kubesphere\.io/workspace
+      name: workspace
+      type: string
+    - jsonPath: .spec.appType
+      name: appType
+      type: string
+    - jsonPath: .status.state
+      name: State
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v2
+    schema:
+      openAPIV3Schema:
+        description: Application is the Schema for the applications API
+        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:
+            description: ApplicationSpec defines the desired state of Application
+            properties:
+              abstraction:
+                type: string
+              appHome:
+                type: string
+              appType:
+                type: string
+              attachments:
+                items:
+                  type: string
+                type: array
+              icon:
+                type: string
+              resources:
+                items:
+                  properties:
+                    Desc:
+                      type: string
+                    Group:
+                      type: string
+                    Name:
+                      type: string
+                    ParentNode:
+                      type: string
+                    Resource:
+                      type: string
+                    Version:
+                      type: string
+                  type: object
+                type: array
+            type: object
+          status:
+            description: ApplicationStatus defines the observed state of Application
+            properties:
+              state:
+                description: 'the state of the helm application: draft, submitted,
+                  passed, rejected, suspended, active'
+                type: string
+              updateTime:
+                format: date-time
+                type: string
+            required:
+            - updateTime
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}