Merge "Add default value for property in x-kubernetes-list-map-keys"

daemonjob-controller/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: A Helm chart for DaemonjobController
 name: daemonjob-controller
-version: 0.1.1
+version: 0.1.2
 home: https://opendev.org/openstack
 ...

daemonjob-controller/templates/crd.yaml

@@ -17,7 +17,6 @@ limitations under the License.
 {{ $groupVersion := .Values.crds.group_version }}
 {{ $groupVersionFormat := printf "%s/%s" $groupName $groupVersion }}
 {{ $crdName := printf "%s.%s" "daemonjobs" $groupName }}
-{{- if not (.Capabilities.APIVersions.Has $groupVersionFormat) }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -1204,6 +1203,7 @@ spec:
                                       description: Protocol for port. Must be UDP, TCP,
                                         or SCTP. Defaults to "TCP".
                                       type: string
+                                      default: "TCP"
                                   required:
                                   - containerPort
                                   type: object
@@ -4122,4 +4122,3 @@ status:
   conditions: []
   storedVersions: []
 {{- end }}
-{{- end }}