92 lines
5.5 KiB
Diff
92 lines
5.5 KiB
Diff
|
|
From 80b39c79d6bfa912af46fe45efec92ce34b1c0f2 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|||
|
|
Date: Fri, 15 Oct 2021 11:45:31 +0800
|
|||
|
|
Subject: [PATCH 01/12] correct docs error
|
|||
|
|
|
|||
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|||
|
|
---
|
|||
|
|
docs/eggops.md | 2 +-
|
|||
|
|
eggops.yaml | 31 +++++++++++++++++++++++++++----
|
|||
|
|
yaml/base.yaml | 2 +-
|
|||
|
|
3 files changed, 29 insertions(+), 6 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/docs/eggops.md b/docs/eggops.md
|
|||
|
|
index 0eec9a5..075b5a5 100644
|
|||
|
|
--- a/docs/eggops.md
|
|||
|
|
+++ b/docs/eggops.md
|
|||
|
|
@@ -239,7 +239,7 @@ metadata:
|
|||
|
|
namespace: eggo-system
|
|||
|
|
spec:
|
|||
|
|
# 用于将package包挂载到容器中,部署集群时使用
|
|||
|
|
- packagePersistentVolumeClain:
|
|||
|
|
+ packagePersistentVolumeClaim:
|
|||
|
|
name: nfs-pvc-example
|
|||
|
|
# 暴露端口,可选项
|
|||
|
|
open-ports:
|
|||
|
|
diff --git a/eggops.yaml b/eggops.yaml
|
|||
|
|
index 42af1e0..606f4da 100644
|
|||
|
|
--- a/eggops.yaml
|
|||
|
|
+++ b/eggops.yaml
|
|||
|
|
@@ -560,6 +560,31 @@ spec:
|
|||
|
|
type: boolean
|
|||
|
|
hasCluster:
|
|||
|
|
type: boolean
|
|||
|
|
+ infrastructureRef:
|
|||
|
|
+ description: 'ObjectReference contains enough information to let you inspect or modify the referred object. --- New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs. 1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage. 2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted". Those cannot be well described when embedded. 3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen. 4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple and the version of the actual struct is irrelevant. 5. We cannot easily change it. Because this type is embedded in many locations, updates to this type will affect numerous schemas. Don''t make new APIs embed an underspecified API type they do not control. Instead of using this type, create a locally provided and used type that is well-focused on your reference. For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .'
|
|||
|
|
+ properties:
|
|||
|
|
+ apiVersion:
|
|||
|
|
+ description: API version of the referent.
|
|||
|
|
+ type: string
|
|||
|
|
+ fieldPath:
|
|||
|
|
+ description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
|
|||
|
|
+ type: string
|
|||
|
|
+ kind:
|
|||
|
|
+ description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|||
|
|
+ type: string
|
|||
|
|
+ name:
|
|||
|
|
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
|
|||
|
|
+ type: string
|
|||
|
|
+ namespace:
|
|||
|
|
+ description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
|
|||
|
|
+ type: string
|
|||
|
|
+ resourceVersion:
|
|||
|
|
+ description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
|
|||
|
|
+ type: string
|
|||
|
|
+ uid:
|
|||
|
|
+ description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
|
|||
|
|
+ type: string
|
|||
|
|
+ type: object
|
|||
|
|
jobHistorys:
|
|||
|
|
items:
|
|||
|
|
properties:
|
|||
|
|
@@ -1599,11 +1624,9 @@ spec:
|
|||
|
|
control-plane: controller-manager
|
|||
|
|
spec:
|
|||
|
|
containers:
|
|||
|
|
- - args:
|
|||
|
|
- - --leader-elect
|
|||
|
|
- command:
|
|||
|
|
+ - command:
|
|||
|
|
- /manager
|
|||
|
|
- image: hub.oepkgs.net/haozi007/eggops:latest
|
|||
|
|
+ image: hub.oepkgs.net/haozi007/eggops:v1.0.0-alpha
|
|||
|
|
livenessProbe:
|
|||
|
|
httpGet:
|
|||
|
|
path: /healthz
|
|||
|
|
diff --git a/yaml/base.yaml b/yaml/base.yaml
|
|||
|
|
index a6018ed..e750db0 100644
|
|||
|
|
--- a/yaml/base.yaml
|
|||
|
|
+++ b/yaml/base.yaml
|
|||
|
|
@@ -62,7 +62,7 @@ metadata:
|
|||
|
|
namespace: eggo-system
|
|||
|
|
spec:
|
|||
|
|
# 用于将package包挂载到容器中,部署集群时使用
|
|||
|
|
- packagePersistentVolumeClain:
|
|||
|
|
+ packagePersistentVolumeClaim:
|
|||
|
|
name: nfs-pvc-example
|
|||
|
|
# 暴露端口
|
|||
|
|
open-ports:
|
|||
|
|
--
|
|||
|
|
2.25.1
|
|||
|
|
|