Merge branch 'master' of https://github.com/openyurtio/openyurt into …

…fix_calico

* 'master' of https://github.com/openyurtio/openyurt:
  Add status info to YurtAppSet/YurtAppDaemon (openyurtio#1702)
  fix: add the logic of removing the finalizer (openyurtio#1695)
  Fix work dir nested `yurthub/yurthub` (openyurtio#1693)
  Add yurtappoverrider (openyurtio#1684)
  modify the logic for judging static pods and combine the utils for pod and node (openyurtio#1689)
  chore: slice loop replace (openyurtio#1690)
  unified expression about DaemonSet (openyurtio#1698)
  improve controller names (openyurtio#1687)
  add gateway public service controller (openyurtio#1685)
  feat: add token format checking to yurtadm join process (openyurtio#1681)
  add gateway internal service controller (openyurtio#1677)
  fix: yurt-iot-dock cannot be dynamically deployed in platformadmin (openyurtio#1679)
  unserve v1alpha1 version of platformadmin crd (openyurtio#1659)

charts/yurt-manager/crds/apps.openyurt.io_yurtappdaemons.yaml

@@ -30,6 +30,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: AGE
       type: date
+    - description: The name of overrider bound to this yurtappdaemon
+      jsonPath: .status.overriderRef
+      name: OverriderRef
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -225,9 +229,32 @@ spec:
                   which is updated on mutation by the API Server.
                 format: int64
                 type: integer
+              overriderRef:
+                type: string
               templateType:
                 description: TemplateType indicates the type of PoolTemplate
                 type: string
+              workloadSummary:
+                description: Records the topology detailed information of each workload.
+                items:
+                  properties:
+                    availableCondition:
+                      type: string
+                    readyReplicas:
+                      format: int32
+                      type: integer
+                    replicas:
+                      format: int32
+                      type: integer
+                    workloadName:
+                      type: string
+                  required:
+                  - availableCondition
+                  - readyReplicas
+                  - replicas
+                  - workloadName
+                  type: object
+                type: array
             required:
             - currentRevision
             - templateType

charts/yurt-manager/crds/apps.openyurt.io_yurtappoverriders.yaml

@@ -0,0 +1,144 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.7.0
+  creationTimestamp: null
+  name: yurtappoverriders.apps.openyurt.io
+spec:
+  group: apps.openyurt.io
+  names:
+    kind: YurtAppOverrider
+    listKind: YurtAppOverriderList
+    plural: yurtappoverriders
+    shortNames:
+      - yao
+    singular: yurtappoverrider
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - description: The subject kind of this overrider.
+          jsonPath: .subject.kind
+          name: Subject
+          type: string
+        - description: The subject name of this overrider.
+          jsonPath: .subject.name
+          name: Name
+          type: string
+        - description: CreationTimestamp is a timestamp representing the server time when
+            this object was created. It is not guaranteed to be set in happens-before
+            order across separate operations. Clients may not set this value. It is represented
+            in RFC3339 form and is in UTC.
+          jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
+      schema:
+        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
+            entries:
+              items:
+                description: Describe detailed multi-region configuration of the subject
+                  Entry describe a set of nodepools and their shared or identical configurations
+                properties:
+                  items:
+                    items:
+                      description: Item represents configuration to be injected. Only
+                        one of its members may be specified.
+                      properties:
+                        image:
+                          description: ImageItem specifies the corresponding container
+                            and the claimed image
+                          properties:
+                            containerName:
+                              description: ContainerName represents name of the container
+                                in which the Image will be replaced
+                              type: string
+                            imageClaim:
+                              description: ImageClaim represents the claimed image name
+                                which is injected into the container above
+                              type: string
+                          required:
+                            - containerName
+                            - imageClaim
+                          type: object
+                        replicas:
+                          format: int32
+                          type: integer
+                      type: object
+                    type: array
+                  patches:
+                    description: Convert Patch struct into json patch operation
+                    items:
+                      properties:
+                        operation:
+                          description: Operation represents the operation
+                          enum:
+                            - add
+                            - remove
+                            - replace
+                          type: string
+                        path:
+                          description: Path represents the path in the json patch
+                          type: string
+                        value:
+                          description: Indicates the value of json patch
+                          x-kubernetes-preserve-unknown-fields: true
+                      required:
+                        - operation
+                        - path
+                      type: object
+                    type: array
+                  pools:
+                    items:
+                      type: string
+                    type: array
+                required:
+                  - pools
+                type: object
+              type: array
+            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
+            subject:
+              description: Describe the object Entries belongs
+              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
+                name:
+                  description: Name is the name of YurtAppSet or YurtAppDaemon
+                  type: string
+              required:
+                - name
+              type: object
+          required:
+            - entries
+            - subject
+          type: object
+      served: true
+      storage: true
+      subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/yurt-manager/crds/apps.openyurt.io_yurtappsets.yaml

@@ -32,6 +32,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: AGE
       type: date
+    - description: The name of overrider bound to this yurtappset
+      jsonPath: .status.overriderRef
+      name: OverriderRef
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -329,6 +333,8 @@ spec:
                   which is updated on mutation by the API Server.
                 format: int64
                 type: integer
+              overriderRef:
+                type: string
               poolReplicas:
                 additionalProperties:
                   format: int32
@@ -347,6 +353,27 @@ spec:
               templateType:
                 description: TemplateType indicates the type of PoolTemplate
                 type: string
+              workloadSummary:
+                description: Records the topology detailed information of each workload.
+                items:
+                  properties:
+                    availableCondition:
+                      type: string
+                    readyReplicas:
+                      format: int32
+                      type: integer
+                    replicas:
+                      format: int32
+                      type: integer
+                    workloadName:
+                      type: string
+                  required:
+                  - availableCondition
+                  - readyReplicas
+                  - replicas
+                  - workloadName
+                  type: object
+                type: array
             required:
             - currentRevision
             - replicas

charts/yurt-manager/crds/iot.openyurt.io_platformadmins.yaml

@@ -8380,7 +8380,7 @@ spec:
                 type: integer
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}

charts/yurt-manager/templates/yurt-manager-auto-generated.yaml

@@ -159,6 +159,14 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - apps.openyurt.io
+  resources:
+  - yurtappoverriders
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - apps.openyurt.io
   resources:
@@ -516,6 +524,26 @@ metadata:
   creationTimestamp: null
   name: yurt-manager-mutating-webhook-configuration
 webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: yurt-manager-webhook-service
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-apps-v1-deployment
+  failurePolicy: Ignore
+  name: mutate.apps.v1.deployment
+  rules:
+  - apiGroups:
+    - apps
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - deployments
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -618,6 +646,27 @@ webhooks:
     resources:
     - yurtappdaemons
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: yurt-manager-webhook-service
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-apps-openyurt-io-v1alpha1-yurtappoverrider
+  failurePolicy: Fail
+  name: mutate.apps.v1alpha1.yurtappoverrider.openyurt.io
+  rules:
+  - apiGroups:
+    - apps.openyurt.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - yurtappoverriders
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
@@ -789,6 +838,28 @@ webhooks:
     resources:
     - yurtappdaemons
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: yurt-manager-webhook-service
+      namespace: {{ .Release.Namespace }}
+      path: /validate-apps-openyurt-io-v1alpha1-yurtappoverrider
+  failurePolicy: Fail
+  name: validate.apps.v1alpha1.yurtappoverrider.openyurt.io
+  rules:
+  - apiGroups:
+    - apps.openyurt.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - yurtappoverriders
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:

charts/yurt-manager/values.yaml

@@ -21,7 +21,7 @@ ports:
   webhook: 10273
 
 # format should be "foo,-bar,*"
-controllers: ""
+controllers: "*"
 
 # format should be "foo,*"
 disableIndependentWebhooks: ""

cmd/yurt-manager/app/manager.go

@@ -36,6 +36,7 @@ import (
 
 	"github.com/openyurtio/openyurt/cmd/yurt-manager/app/config"
 	"github.com/openyurtio/openyurt/cmd/yurt-manager/app/options"
+	"github.com/openyurtio/openyurt/cmd/yurt-manager/names"
 	"github.com/openyurtio/openyurt/pkg/apis"
 	"github.com/openyurtio/openyurt/pkg/projectinfo"
 	"github.com/openyurtio/openyurt/pkg/util/profile"
@@ -93,7 +94,7 @@ current state towards the desired state.`,
 
 			PrintFlags(cmd.Flags())
 
-			c, err := s.Config()
+			c, err := s.Config(controller.KnownControllers(), names.YurtManagerControllerAliases())
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "%v\n", err)
 				os.Exit(1)
@@ -115,7 +116,7 @@ current state towards the desired state.`,
 	}
 
 	fs := cmd.Flags()
-	namedFlagSets := s.Flags()
+	namedFlagSets := s.Flags(controller.KnownControllers(), controller.ControllersDisabledByDefault.List())
 	// verflag.AddFlags(namedFlagSets.FlagSet("global"))
 	globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name())
 	for _, f := range namedFlagSets.FlagSets {