Merge pull request #664 from xiaolao/dev

[Helm Charts] Adjust helm charts

Author: xiaolao

Makefile

@@ -1,21 +1,14 @@
 # Image URL to use all building/pushing image targets
-#PADDLEJOB_IMG ?= registry.baidubce.com/paddle-operator/paddlejob
-#SAMPLESET_IMG ?= registry.baidubce.com/paddle-operator/sampleset
-#RUNTIME_IMG ?= registry.baidubce.com/paddle-operator/runtime
-#SERVING_IMG ?= registry.baidubce.com/paddle-operator/serving
-
-PADDLEJOB_IMG ?= xiaolao/paddlejob
-SAMPLESET_IMG ?= xiaolao/sampleset
-RUNTIME_IMG ?= xiaolao/runtime
-SERVING_IMG ?= xiaolao/serving
+PADDLEJOB_IMG ?= registry.baidubce.com/paddleflow-public/paddlecloud/paddlejob
+SAMPLESET_IMG ?= registry.baidubce.com/paddleflow-public/paddlecloud/sampleset
+RUNTIME_IMG ?= registry.baidubce.com/paddleflow-public/paddlecloud/runtime
+SERVING_IMG ?= registry.baidubce.com/paddleflow-public/paddlecloud/serving
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:maxDescLen=0,generateEmbeddedObjectMeta=true,trivialVersions=true,preserveUnknownFields=false"
 
-# Set version and get git tag
-VERSION=v0.1
-GIT_SHA=$(shell git rev-parse --short HEAD || echo "HEAD")
-GIT_VERSION=${VERSION}-${GIT_SHA}
+# Set version
+VERSION=0.4.0
 
 # Run go fmt against code
 fmt:
@@ -45,35 +38,35 @@ docker-build-all: docker-build-paddlejob docker-build-sampleset docker-build-run
 
 # Build paddlejob controller image
 docker-build-paddlejob: test
-	docker build . -f docker/Dockerfile.paddlejob -t ${PADDLEJOB_IMG}:${GIT_VERSION}
+	docker build . -f docker/Dockerfile.paddlejob -t ${PADDLEJOB_IMG}:${VERSION}
 
 # Build sampleset controller image
 docker-build-sampleset: test
-	docker build . --build-arg RUNTIME_IMG=${RUNTIME_IMG} --build-arg GIT_VERSION=${GIT_VERSION} \
-		-f docker/Dockerfile.sampleset -t ${SAMPLESET_IMG}:${GIT_VERSION}
+	docker build . --build-arg RUNTIME_IMG=${RUNTIME_IMG} --build-arg VERSION=${VERSION} \
+		-f docker/Dockerfile.sampleset -t ${SAMPLESET_IMG}:${VERSION}
 
 docker-build-runtime: test
-	docker build . -f docker/Dockerfile.runtime -t ${RUNTIME_IMG}:${GIT_VERSION}
+	docker build . -f docker/Dockerfile.runtime -t ${RUNTIME_IMG}:${VERSION}
 
 docker-build-serving: test
-	docker build . -f docker/Dockerfile.serving -t ${SERVING_IMG}:${GIT_VERSION}
+	docker build . -f docker/Dockerfile.serving -t ${SERVING_IMG}:${VERSION}
 
 # Push all docker images
 docker-push-all: docker-push-paddlejob docker-push-sampleset docker-push-runtime docker-push-serving
 
 # Push the docker image
 docker-push-paddlejob:
-	docker push ${PADDLEJOB_IMG}:${GIT_VERSION}
+	docker push ${PADDLEJOB_IMG}:${VERSION}
 
 # Push the sampleset docker image
 docker-push-sampleset:
-	docker push ${SAMPLESET_IMG}:${GIT_VERSION}
+	docker push ${SAMPLESET_IMG}:${VERSION}
 
 docker-push-runtime:
-	docker push ${RUNTIME_IMG}:${GIT_VERSION}
+	docker push ${RUNTIME_IMG}:${VERSION}
 
 docker-push-serving:
-	docker push ${SERVING_IMG}:${GIT_VERSION}
+	docker push ${SERVING_IMG}:${VERSION}
 
 update-api-doc:
 	bash docs/api-doc-gen/gen_api_doc.sh

charts/Chart.yaml

@@ -1,40 +1,54 @@
+annotations:
+  category: mlops
 apiVersion: v2
-name: paddlecloud
-description: A Helm chart to deploy paddle cloud ops in Kubernetes
-
-# 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.
+appVersion: 0.4.0
 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.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: 0.1.0
-
+description: PaddlePaddle Docker images and K8s operators for PaddleOCR/Detection developers to use on public/private cloud.
 home: https://github.com/PaddlePaddle/PaddleCloud
+icon: https://avatars.githubusercontent.com/u/23534030?s=200&v=4
+keywords:
+  - paddle
+  - PaddlePaddle
+  - mlops
+  - paddlecloud
+name: paddlecloud
 sources:
   - https://github.com/PaddlePaddle/PaddleCloud
+version: 0.0.1
 
 dependencies:
+  - name: paddle-training
+    version: 0.1.0
+    repository: file://charts/training
+    condition: paddle-training.enabled
+    alias: training
   - name: juicefs-csi-driver
-    version: v0.8.1
+    version: 0.8.1
     repository: file://charts/juicefs
-    condition: global.enableSampleSet
+    condition: juicefs.enabled
     alias: juicefs
-
-keywords:
-  - category:Paddle
-  - Paddle
-  - namespace:paddle-system
-  - releaseName:paddlecloud
+  - name: redis
+    version: 16.5.4
+    repository: file://charts/redis
+    condition: redis.enabled
+  - name: paddle-serving
+    version: 0.1.0
+    repository: file://charts/serving
+    condition: paddle-serving.enabled
+    alias: serving
+  - name: knative-serving
+    version: 0.1.0
+    repository: file://charts/knative
+    condition: knative.enabled
+    alias: knative
+  - name: net-kourier
+    version: 0.1.0
+    repository: file://charts/kourier
+    condition: kourier.enabled
+    alias: kourier
+  - name: kubeflow-pipelines
+    version: 0.1.0
+    repository: file://charts/pipelines
+    condition: pipelines.enabled
+    alias: pipelines
+  - name:

charts/LICENSE

@@ -0,0 +1,13 @@
+Copyright © 2022 Bitnami
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

charts/charts/knative/Chart.yaml

@@ -1,24 +1,16 @@
+annotations:
+  category: serverless
 apiVersion: v2
-name: knative
-description: A Helm chart for Kubernetes
-
-# 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.
+appVersion: 1.2.0
 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/)
+description: Knative Serving builds on Kubernetes to support deploying and serving of applications and functions as serverless containers. Serving is easy to get started with and scales to support advanced scenarios.
+home: https://github.com/knative/serving
+icon: https://knative.dev/docs/images/logo/rgb/knative-logo-rgb.png
+keywords:
+  - knative
+  - serving
+  - serverless
+name: knative-serving
+sources:
+  - https://github.com/knative/serving
 version: 0.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.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"

charts/charts/knative/crds/autoscaling.internal.knative.dev_metrics.yaml renamed to charts/charts/knative/templates/crds/autoscaling.internal.knative.dev_metrics.yaml

@@ -0,0 +1,21 @@
+## @param kubeVersion Override Kubernetes version
+##
+kubeVersion: ""
+## @param nameOverride String to partially override common.names.fullname
+##
+nameOverride: ""
+## @param fullnameOverride String to fully override common.names.fullname
+##
+fullnameOverride: ""
+## @param commonLabels Labels to add to all deployed objects
+##
+commonLabels: {}
+## @param commonAnnotations Annotations to add to all deployed objects
+##
+commonAnnotations: {}
+## @param clusterDomain Kubernetes cluster domain name
+##
+clusterDomain: cluster.local
+## @param extraDeploy Array of extra objects to deploy with the release
+##`
+extraDeploy: []

charts/charts/knative/crds/autoscaling.internal.knative.dev_podautoscalers.yaml renamed to charts/charts/knative/templates/crds/autoscaling.internal.knative.dev_podautoscalers.yaml

@@ -0,0 +1,16 @@
+annotations:
+  category: ingress
+apiVersion: v2
+appVersion: 1.2.0
+type: application
+description: Kourier is an Ingress for Knative Serving. Kourier is a lightweight alternative for the Istio ingress as its deployment consists only of an Envoy proxy and a control plane for it.
+home: https://github.com/knative-sandbox/net-kourier
+icon: https://knative.dev/docs/images/logo/rgb/knative-logo-rgb.png
+keywords:
+  - kourier
+  - knative
+  - ingress
+name: net-kourier
+sources:
+  - https://github.com/knative-sandbox/net-kourier
+version: 0.1.0

charts/charts/knative/crds/caching.internal.knative.dev_images.yaml renamed to charts/charts/knative/templates/crds/caching.internal.knative.dev_images.yaml

@@ -0,0 +1,21 @@
+## @param kubeVersion Override Kubernetes version
+##
+kubeVersion: ""
+## @param nameOverride String to partially override common.names.fullname
+##
+nameOverride: ""
+## @param fullnameOverride String to fully override common.names.fullname
+##
+fullnameOverride: ""
+## @param commonLabels Labels to add to all deployed objects
+##
+commonLabels: {}
+## @param commonAnnotations Annotations to add to all deployed objects
+##
+commonAnnotations: {}
+## @param clusterDomain Kubernetes cluster domain name
+##
+clusterDomain: cluster.local
+## @param extraDeploy Array of extra objects to deploy with the release
+##`
+extraDeploy: []