diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 207ff2e65..6e4eb1268 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -251,7 +251,7 @@ jobs: fi # We always need to add '-stig-fips' suffix for corresponding image version - # TODO: do not DOCA Driver image for now because $SOURCE_REPO is null one Network Operator will support a new version format + # TODO: do not DOCA Driver image for now because $SOURCE_REPO is null one Network Operator will support a new version format if [[ "$component" == *StigFips ]]; then component_tag="${COMPONENT_TAG}-stig-fips" else @@ -294,7 +294,7 @@ jobs: if echo "$EXCLUDE_CHART_FILES" | jq -e --arg value "$REL_PATH" 'index($value) != null' > /dev/null; then echo "Exclude chart file $file from update" git restore --staged $file - git checkout $file + git checkout $file || true else echo "Update chart file $file" fi diff --git a/deployment/network-operator/charts/sriov-network-operator/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml b/deployment/network-operator/charts/sriov-network-operator/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml deleted file mode 100644 index 5916055f0..000000000 --- a/deployment/network-operator/charts/sriov-network-operator/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2020 NVIDIA -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: network-attachment-definitions.k8s.cni.cncf.io -spec: - group: k8s.cni.cncf.io - scope: Namespaced - names: - plural: network-attachment-definitions - singular: network-attachment-definition - kind: NetworkAttachmentDefinition - shortNames: - - net-attach-def - versions: - - name: v1 - served: true - storage: true - schema: - openAPIV3Schema: - description: 'NetworkAttachmentDefinition is a CRD schema specified by the Network Plumbing - Working Group to express the intent for attaching pods to one or more logical or physical - networks. More information available at: https://github.com/k8snetworkplumbingwg/multi-net-spec' - type: object - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this represen - tation 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 - metadata: - type: object - spec: - description: 'NetworkAttachmentDefinition spec defines the desired state of a network attachment' - type: object - properties: - config: - description: 'NetworkAttachmentDefinition config is a JSON-formatted CNI configuration' - type: string diff --git a/hack/release.yaml b/hack/release.yaml index 4c8255ca4..5863e65cb 100644 --- a/hack/release.yaml +++ b/hack/release.yaml @@ -13,7 +13,7 @@ SriovNetworkOperator: sourceRepository: sriov-network-operator version: network-operator-v25.10.0-beta.5 chartLocation: deployment/sriov-network-operator-chart - excludeChartFiles: ["Chart.yaml"] + excludeChartFiles: ["Chart.yaml", "crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml"] SriovNetworkOperatorWebhook: image: sriov-network-operator-webhook repository: nvcr.io/nvstaging/mellanox