ci: bump submariner to 0.18.0

.github/workflows/build-x86-image.yaml

@@ -24,8 +24,8 @@ env:
   GO_VERSION: ''
   KIND_VERSION: v0.23.0
   GOSEC_VERSION: '2.20.0'
-  HELM_VERSION: v3.14.4
-  SUBMARINER_VERSION: '0.17.1'
+  HELM_VERSION: v3.15.3
+  SUBMARINER_VERSION: '0.18.0'
 
 jobs:
   build-kube-ovn-base:

Makefile

@@ -27,16 +27,16 @@ endif
 
 CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/control-plane
 
-FRR_VERSION = 9.0.2
+FRR_VERSION = 9.1.1
 FRR_IMAGE = quay.io/frrouting/frr:$(FRR_VERSION)
 
-CLAB_IMAGE = ghcr.io/srl-labs/clab:0.54.2
+CLAB_IMAGE = ghcr.io/srl-labs/clab:0.56.0
 
 MULTUS_VERSION = v4.0.2
 MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:$(MULTUS_VERSION)-thick
 MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/$(MULTUS_VERSION)/deployments/multus-daemonset-thick.yml
 
-METALLB_VERSION = 0.14.5
+METALLB_VERSION = 0.14.7
 METALLB_CHART_REPO = https://metallb.github.io/metallb
 METALLB_CONTROLLER_IMAGE = quay.io/metallb/controller:v$(METALLB_VERSION)
 METALLB_SPEAKER_IMAGE = quay.io/metallb/speaker:v$(METALLB_VERSION)
@@ -50,16 +50,16 @@ KUBEVIRT_LAUNCHER_IMAGE = quay.io/kubevirt/virt-launcher:$(KUBEVIRT_VERSION)
 KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-operator.yaml
 KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml
 
-CILIUM_VERSION = 1.15.5
+CILIUM_VERSION = 1.15.7
 CILIUM_IMAGE_REPO = quay.io/cilium
 
-CERT_MANAGER_VERSION = v1.14.5
+CERT_MANAGER_VERSION = v1.15.1
 CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION)
 CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION)
 CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION)
 CERT_MANAGER_YAML = https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml
 
-SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.17.1})
+SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.18.0})
 SUBMARINER_OPERATOR = quay.io/submariner/submariner-operator:$(SUBMARINER_VERSION)
 SUBMARINER_GATEWAY = quay.io/submariner/submariner-gateway:$(SUBMARINER_VERSION)
 SUBMARINER_LIGHTHOUSE_AGENT = quay.io/submariner/lighthouse-agent:$(SUBMARINER_VERSION)
@@ -78,7 +78,7 @@ DEEPFLOW_GRAFANA_NODE_PORT = 30080
 DEEPFLOW_MAPPED_PORTS = $(DEEPFLOW_SERVER_NODE_PORT),$(DEEPFLOW_SERVER_GRPC_PORT),$(DEEPFLOW_SERVER_HTTP_PORT),$(DEEPFLOW_GRAFANA_NODE_PORT)
 DEEPFLOW_CTL_URL = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/bin/ctl/$(DEEPFLOW_VERSION)/linux/$(shell arch | sed 's|x86_64|amd64|' | sed 's|aarch64|arm64|')/deepflow-ctl
 
-KWOK_VERSION = v0.5.2
+KWOK_VERSION = v0.6.0
 KWOK_IMAGE = registry.k8s.io/kwok/kwok:$(KWOK_VERSION)
 
 VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(VERSION)

yamls/kwok-stage.yaml

@@ -108,19 +108,20 @@ spec:
         memory: 1Ti
         pods: 1M
       {{ end }}
-      {{ with .status.nodeInfo }}
+
+      {{ $nodeInfo := .status.nodeInfo }}
+      {{ $kwokVersion := printf "kwok-%s" Version }}
       nodeInfo:
-        architecture: {{ with .architecture }} {{ . }} {{ else }} "amd64" {{ end }}
-        bootID: {{ with .bootID }} {{ . }} {{ else }} "" {{ end }}
-        containerRuntimeVersion: {{ with .containerRuntimeVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        kernelVersion: {{ with .kernelVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        kubeProxyVersion: {{ with .kubeProxyVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        kubeletVersion: {{ with .kubeletVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        machineID: {{ with .machineID }} {{ . }} {{ else }} "" {{ end }}
-        operatingSystem: {{ with .operatingSystem }} {{ . }} {{ else }} "linux" {{ end }}
-        osImage: {{ with .osImage }} {{ . }} {{ else }} "" {{ end }}
-        systemUUID: {{ with .systemUUID }} {{ . }} {{ else }} "" {{ end }}
-      {{ end }}
+        architecture: {{ or $nodeInfo.architecture "amd64" }}
+        bootID: {{ or $nodeInfo.bootID `""` }}
+        containerRuntimeVersion: {{ or $nodeInfo.containerRuntimeVersion $kwokVersion }}
+        kernelVersion: {{ or $nodeInfo.kernelVersion $kwokVersion }}
+        kubeProxyVersion: {{ or $nodeInfo.kubeProxyVersion $kwokVersion }}
+        kubeletVersion: {{ or $nodeInfo.kubeletVersion $kwokVersion }}
+        machineID: {{ or $nodeInfo.machineID `""` }}
+        operatingSystem: {{ or $nodeInfo.operatingSystem "linux" }}
+        osImage: {{ or $nodeInfo.osImage `""` }}
+        systemUUID: {{ or $nodeInfo.systemUUID `""` }}
       phase: Running
   resourceRef:
     apiGroup: v1
@@ -232,12 +233,19 @@ spec:
         name: {{ .name | Quote }}
         ready: true
         restartCount: 0
+        {{ if eq .restartPolicy "Always" }}
+        started: true
+        state:
+          running:
+            startedAt: {{ $now | Quote }}
+        {{ else }}
         state:
           terminated:
             exitCode: 0
             finishedAt: {{ $now | Quote }}
             reason: Completed
             startedAt: {{ $now | Quote }}
+        {{ end }}
       {{ end }}
 
       hostIP: {{ NodeIPWith .spec.nodeName | Quote }}

yamls/kwok.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: attaches.kwok.x-k8s.io
@@ -127,7 +127,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: clusterattaches.kwok.x-k8s.io
@@ -267,7 +267,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: clusterexecs.kwok.x-k8s.io
@@ -449,7 +449,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: clusterlogs.kwok.x-k8s.io
@@ -596,7 +596,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: clusterportforwards.kwok.x-k8s.io
@@ -763,7 +763,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: clusterresourceusages.kwok.x-k8s.io
@@ -920,7 +920,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: execs.kwok.x-k8s.io
@@ -1084,7 +1084,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: logs.kwok.x-k8s.io
@@ -1213,7 +1213,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: metrics.kwok.x-k8s.io
@@ -1406,7 +1406,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: portforwards.kwok.x-k8s.io
@@ -1556,7 +1556,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: resourceusages.kwok.x-k8s.io
@@ -1695,7 +1695,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app: kwok-controller
   name: stages.kwok.x-k8s.io
@@ -1829,12 +1829,53 @@ spec:
                           type: object
                         type: array
                     type: object
+                  patches:
+                    description: Patches means that the resource will be patched.
+                    items:
+                      description: StagePatch describes the patch for the resource.
+                      properties:
+                        impersonation:
+                          description: |-
+                            Impersonation indicates the impersonating configuration for client when patching status.
+                            In most cases this will be empty, in which case the default client service account will be used.
+                            When this is not empty, a corresponding rbac change is required to grant `impersonate` privilege.
+                            The support for this field is not available in Pod and Node resources.
+                          properties:
+                            username:
+                              description: Username the target username for the client
+                                to impersonate
+                              type: string
+                          required:
+                          - username
+                          type: object
+                        root:
+                          description: Root indicates the root of the template calculated
+                            by the patch.
+                          type: string
+                        subresource:
+                          description: Subresource indicates the name of the subresource
+                            that will be patched.
+                          type: string
+                        template:
+                          description: Template indicates the template for modifying
+                            the resource in the next.
+                          type: string
+                        type:
+                          description: Type indicates the type of the patch.
+                          enum:
+                          - json
+                          - merge
+                          - strategic
+                          type: string
+                      type: object
+                    type: array
                   statusPatchAs:
                     description: |-
                       StatusPatchAs indicates the impersonating configuration for client when patching status.
                       In most cases this will be empty, in which case the default client service account will be used.
                       When this is not empty, a corresponding rbac change is required to grant `impersonate` privilege.
                       The support for this field is not available in Pod and Node resources.
+                      Deprecated: Use Patches instead.
                     properties:
                       username:
                         description: Username the target username for the client to
@@ -1848,10 +1889,12 @@ spec:
                     description: |-
                       StatusSubresource indicates the name of the subresource that will be patched. The support for
                       this field is not available in Pod and Node resources.
+                      Deprecated: Use Patches instead.
                     type: string
                   statusTemplate:
-                    description: StatusTemplate indicates the template for modifying
-                      the status of the resource in the next.
+                    description: |-
+                      StatusTemplate indicates the template for modifying the status of the resource in the next.
+                      Deprecated: Use Patches instead.
                     type: string
                 type: object
               resourceRef:
@@ -1924,6 +1967,17 @@ spec:
                   a random stage will be matched as the next stage based on the weight.
                 minimum: 0
                 type: integer
+              weightFrom:
+                description: |-
+                  WeightFrom means is the expression used to get the value.
+                  If it is a number type, convert to int.
+                  If it is a string type, the value get will be parsed by strconv.ParseInt.
+                properties:
+                  expressionFrom:
+                    description: ExpressionFrom is the expression used to get the
+                      value.
+                    type: string
+                type: object
             required:
             - next
             - resourceRef
@@ -2347,8 +2401,6 @@ spec:
         - --manage-nodes-with-annotation-selector=kwok.x-k8s.io/node=fake
         - --manage-nodes-with-label-selector=
         - --manage-single-node=
-        - --disregard-status-with-annotation-selector=kwok.x-k8s.io/status=custom
-        - --disregard-status-with-label-selector=
         - --node-ip=$(POD_IP)
         - --node-port=10247
         - --cidr=10.0.0.1/24
@@ -2374,7 +2426,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.hostIP
-        image: registry.k8s.io/kwok/kwok:v0.5.1
+        image: registry.k8s.io/kwok/kwok:v0.6.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10