Merge pull request #20 from xishengcai/n1

support service annotation

apis/core/v1alpha2/core_workload_types.go

@@ -426,6 +426,8 @@ type ContainerizedWorkloadSpec struct {
 	// More info: https://kubernetes.io/docs/concepts/services-networking/service/
 	// +optional
 	ServiceType corev1.ServiceType `json:"serviceType,omitempty"`
+
+	ServiceAnnotation map[string]string `json:"serviceAnnotation,omitempty"`
 }
 
 type Dependency struct {

build.sh

@@ -37,8 +37,8 @@ if [ -z "$VERSION" ]; then
 fi
 
 if [ -z "$IMAGE_REPO" ]; then
-#  IMAGE_REPO='registry.cn-beijing.aliyuncs.com/launcher-agent-only-dev'
-  IMAGE_REPO='registry.cn-hangzhou.aliyuncs.com/launcher-agent-only-test'
+  IMAGE_REPO='registry.cn-beijing.aliyuncs.com/launcher-agent-only-dev'
+#  IMAGE_REPO='registry.cn-hangzhou.aliyuncs.com/launcher-agent-only-test'
 fi
 
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build   -o  ./bin/${BIN_FILE} ./main.go

charts/oam-kubernetes-runtime/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: oam-kubernetes-runtime
 description: A Helm chart for OAM Kubernetes Resources Controller
 
@@ -14,8 +14,8 @@ 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.
-version: 0.81.0
+version: 0.91.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.
-appVersion: 0.1
+appVersion: 3.9.3

charts/oam-kubernetes-runtime/crds/core.oam.dev_containerizedworkloads.yaml

@@ -855,6 +855,10 @@ spec:
               pointToGrayName:
                 description: old grey workload name need modify match selector
                 type: string
+              serviceAnnotation:
+                additionalProperties:
+                  type: string
+                type: object
               serviceMesh:
                 description: check add istio label
                 type: boolean

examples/workload-node-port/sample_component.yaml

@@ -7,7 +7,8 @@ spec:
     apiVersion: core.oam.dev/v1alpha2
     kind: ContainerizedWorkload
     spec:
-      serviceType: LoadBalancer
+      forceUpdateTimestamp: 2022-05-31 03:51:49.22334519 +0000 UTC m=+6038.673245278
+      serviceType: ClusterIP
       containers:
         - name: wordpress
           image: wordpress:4.6.1-apache
@@ -16,7 +17,7 @@ spec:
               name: wordpress
             - containerPort: 81
               name: xxx
-          #              nodePort: 31234
+              nodePort: 0
           env:
             - name: TEST_ENV
               value: test

pkg/controller/v1alpha2/core/workloads/containerizedworkload/containerizedworkload_controller.go

@@ -200,6 +200,10 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		// server side apply the service
 		if err := r.applicator.Apply(ctx, service, applyOpts...); err != nil {
 			klog.ErrorS(err, "Failed to apply a service")
+			delErr := r.Client.Delete(ctx, service)
+			if delErr != nil {
+				klog.ErrorS(delErr, "Failed to delete a service")
+			}
 			r.record.Event(eventObj, event.Warning(errApplyService, err))
 			return util.ReconcileWaitResult,
 				util.PatchCondition(ctx, r, &workload, cpv1alpha1.ReconcileError(errors.Wrap(err, errApplyService)))

pkg/controller/v1alpha2/core/workloads/containerizedworkload/containerizedworkload_controller_helper.go

@@ -85,16 +85,8 @@ func (r *Reconciler) renderService(ctx context.Context,
 	if service == nil || len(service.Spec.Ports) == 0 {
 		return nil, nil
 	}
-	// the service injector lib doesn't set the namespace and serviceType
 	service.Namespace = workload.Namespace
-	// k8s server-side patch complains if the protocol is not set
-
-	for index, i := range service.Spec.Ports {
-		if i.Protocol == "" {
-			service.Spec.Ports[index].Protocol = corev1.ProtocolTCP
-		}
-	}
-	// always set the controller reference so that we can watch this service and
+	service.Annotations = workload.Spec.ServiceAnnotation
 	if err := ctrl.SetControllerReference(workload, service, r.Scheme); err != nil {
 		return nil, err
 	}

pkg/controller/v1alpha2/core/workloads/containerizedworkload/translate.go

@@ -407,6 +407,7 @@ func ServiceInjector(_ context.Context, w *v1alpha2.ContainerizedWorkload, obj r
 		for _, c := range container.Ports {
 			svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
 				Name:       fmt.Sprintf("cont-%d-%s", index, c.Name),
+				Protocol:   corev1.ProtocolTCP,
 				Port:       c.Port,
 				TargetPort: intstr.FromInt(int(c.Port)),
 				NodePort:   c.NodePort,