From 6692944e9a6cceb93a049fbf1535732b52fb9100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Thu, 25 Nov 2021 11:56:56 +0100 Subject: [PATCH] Update and rework OLM bundle creation (#898) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update operator-sdk Signed-off-by: Christoph Stäbler * Fix operator rbac Signed-off-by: Christoph Stäbler * Rework bundle generation * Added a base clusterserviceversion with default values for the generated csv. * Moved the nncp and nmstate CRs into the examples directory so they will be included in the CSV. Signed-off-by: Christoph Stäbler --- Makefile | 7 +- PROJECT | 2 +- bundle.Dockerfile | 14 +- ...mstate-operator.clusterserviceversion.yaml | 163 +++++++--- .../nmstate-operator_v1_serviceaccount.yaml | 7 - bundle/manifests/nmstate.io_nmstates.yaml | 257 ++++++++++++++- ...io_nodenetworkconfigurationenactments.yaml | 160 ++++++++++ ...e.io_nodenetworkconfigurationpolicies.yaml | 293 ++++++++++++++++++ .../nmstate.io_nodenetworkstates.yaml | 157 ++++++++++ bundle/metadata/annotations.yaml | 15 +- bundle/tests/scorecard/.gitkeep | 0 cluster/sync.sh | 2 +- controllers/operator/nmstate_controller.go | 2 +- ...mstate-operator.clusterserviceversion.yaml | 50 +++ ..._nodenetworkconfigurationenactment_cr.yaml | 32 -- ...mstate.io_v1beta1_nodenetworkstate_cr.yaml | 188 ----------- .../nmstate.io_v1_nmstate_cr.yaml | 0 ..._v1_nodenetworkconfigurationpolicy_cr.yaml | 0 deploy/operator/role.yaml | 1 - hack/render-manifests.go | 5 + 20 files changed, 1062 insertions(+), 293 deletions(-) delete mode 100644 bundle/manifests/nmstate-operator_v1_serviceaccount.yaml create mode 100644 bundle/manifests/nmstate.io_nodenetworkconfigurationenactments.yaml create mode 100644 bundle/manifests/nmstate.io_nodenetworkconfigurationpolicies.yaml create mode 100644 bundle/manifests/nmstate.io_nodenetworkstates.yaml create mode 100644 bundle/tests/scorecard/.gitkeep create mode 100644 deploy/bases/kubernetes-nmstate-operator.clusterserviceversion.yaml delete mode 100644 deploy/crds/nmstate.io_v1beta1_nodenetworkconfigurationenactment_cr.yaml delete mode 100644 deploy/crds/nmstate.io_v1beta1_nodenetworkstate_cr.yaml rename deploy/{crds => examples}/nmstate.io_v1_nmstate_cr.yaml (100%) rename deploy/{crds => examples}/nmstate.io_v1_nodenetworkconfigurationpolicy_cr.yaml (100%) diff --git a/Makefile b/Makefile index 4186958fa0..f43febe9e1 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ OPERATOR_SDK ?= $(GOBIN)/operator-sdk GINKGO = go run github.com/onsi/ginkgo/ginkgo CONTROLLER_GEN = go run sigs.k8s.io/controller-tools/cmd/controller-gen -OPM = go run github.com/operator-framework/operator-registry/cmd/opm +OPM = go run -tags=json1 github.com/operator-framework/operator-registry/cmd/opm LOCAL_REGISTRY ?= registry:5000 @@ -122,7 +122,7 @@ lint: $(GO) hack/lint.sh $(OPERATOR_SDK): - curl https://github.com/operator-framework/operator-sdk/releases/download/v1.7.1/operator-sdk_linux_amd64 -o $(OPERATOR_SDK) + curl https://github.com/operator-framework/operator-sdk/releases/download/v1.15.0/operator-sdk_linux_amd64 -o $(OPERATOR_SDK) gen-k8s: $(GO) $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." @@ -206,6 +206,7 @@ vendor: $(GO) # Generate bundle manifests and metadata, then validate generated files. bundle: $(OPERATOR_SDK) gen-crds manifests + cp -r deploy/bases $(MANIFESTS_DIR)/bases $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) --deploy-dir $(MANIFESTS_DIR) --crds-dir deploy/crds $(OPERATOR_SDK) bundle validate ./bundle @@ -215,7 +216,7 @@ bundle-build: # Build the index index-build: $(GO) bundle-build - $(OPM) index add --bundles $(BUNDLE_IMG) --tag $(INDEX_IMG) + $(OPM) index add --bundles $(BUNDLE_IMG) --tag $(INDEX_IMG) --build-tool $(IMAGE_BUILDER) bundle-push: bundle-build $(IMAGE_BUILDER) push $(BUNDLE_IMG) diff --git a/PROJECT b/PROJECT index 305246e8a9..e61ac7f3d5 100644 --- a/PROJECT +++ b/PROJECT @@ -1,7 +1,7 @@ domain: nmstate.io layout: - go.kubebuilder.io/v3 -projectName: kubernetes-nmstate +projectName: kubernetes-nmstate-operator repo: github.com/nmstate/kubernetes-nmstate resources: - api: diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 4077c82c25..1725a90216 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -1,14 +1,20 @@ FROM scratch +# Core bundle labels. LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=kubernetes-nmstate +LABEL operators.operatorframework.io.bundle.package.v1=kubernetes-nmstate-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.13.0+git LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2 -LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 + +# Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 +LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ + +# Copy files to locations specified by labels. COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ +COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml b/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml index 07e3b7fc07..976fdd0b8a 100644 --- a/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml +++ b/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml @@ -3,28 +3,76 @@ kind: ClusterServiceVersion metadata: annotations: alm-examples: |- - [{ - "apiVersion": "nmstate.io/v1", - "kind": "NMState", - "metadata": { - "name": "nmstate" + [ + { + "apiVersion": "nmstate.io/v1", + "kind": "NMState", + "metadata": { + "name": "nmstate" + } }, - "spec": { - "nodeSelector": "" + { + "apiVersion": "nmstate.io/v1", + "kind": "NodeNetworkConfigurationPolicy", + "metadata": { + "name": "example-nodenetworkconfigurationpolicy" + }, + "spec": { + "desiredState": { + "interfaces": [ + { + "bridge": { + "options": { + "stp": { + "enabled": false + } + }, + "port": [ + { + "name": "eth1" + } + ] + }, + "name": "br0", + "state": "up", + "type": "linux-bridge" + }, + { + "bridge": { + "options": { + "stp": { + "enabled": false + } + }, + "port": [ + { + "name": "eth2" + } + ] + }, + "name": "br1", + "state": "up", + "type": "linux-bridge" + } + ] + } + } } - }] + ] capabilities: Basic Install - operators.operatorframework.io/builder: operator-sdk-v1.0.0 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 categories: Networking + certified: "false" + containerImage: quay.io/nmstate/kubernetes-nmstate-operator:latest + createdAt: "2021-11-24 16:05:00" description: | Kubernetes NMState is a declaritive means of configuring NetworkManager. - containerImage: quay.io/nmstate/kubernetes-nmstate-operator:latest - createdAt: 2020-011-12 17:13:03 - support: nmstate.io - repository: https://github.com/nmstate/kubernetes-nmstate operatorframework.io/suggested-namespace: nmstate - certified: "false" + operators.operatorframework.io/builder: operator-sdk-v1.13.0+git + operators.operatorframework.io/internal-objects: '["nodenetworkconfigurationenactments.nmstate.io", + "nodenetworkstates.nmstate.io"]' + operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 + repository: https://github.com/nmstate/kubernetes-nmstate + support: nmstate.io name: kubernetes-nmstate-operator.v0.0.1 namespace: placeholder spec: @@ -34,37 +82,51 @@ spec: - kind: NMState name: nmstates.nmstate.io version: v1 - description: Represents an NMState deployment. - displayName: NMState - description: A Kubernetes Operator to install Kubernetes NMState - displayName: Kubernetes NMState Operator + - kind: NMState + name: nmstates.nmstate.io + version: v1beta1 + - kind: NodeNetworkConfigurationEnactment + name: nodenetworkconfigurationenactments.nmstate.io + version: v1alpha1 + - kind: NodeNetworkConfigurationEnactment + name: nodenetworkconfigurationenactments.nmstate.io + version: v1beta1 + - kind: NodeNetworkConfigurationPolicy + name: nodenetworkconfigurationpolicies.nmstate.io + version: v1 + - kind: NodeNetworkConfigurationPolicy + name: nodenetworkconfigurationpolicies.nmstate.io + version: v1alpha1 + - kind: NodeNetworkConfigurationPolicy + name: nodenetworkconfigurationpolicies.nmstate.io + version: v1beta1 + - kind: NodeNetworkState + name: nodenetworkstates.nmstate.io + version: v1alpha1 + - kind: NodeNetworkState + name: nodenetworkstates.nmstate.io + version: v1beta1 + description: Kubernetes Nmstate description. + displayName: Kubernetes Nmstate icon: - - base64data: >- - <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.47 133.88"><defs><style>.cls-1{fill:#1d56d8;}.cls-2{fill:#70adef;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M17.51,113.68a6.5,6.5,0,0,0-4.3-1.33,11.7,11.7,0,0,0-3.61.51A13.67,13.67,0,0,0,6.9,114v19a5.18,5.18,0,0,1-.76.23,4.41,4.41,0,0,1-1.12.13q-2.19,0-2.19-1.83V114.24a3.23,3.23,0,0,1,.43-1.76,4.59,4.59,0,0,1,1.5-1.35,15.18,15.18,0,0,1,3.51-1.47,17.11,17.11,0,0,1,4.94-.67,11.56,11.56,0,0,1,7.3,2.09q2.67,2.08,2.67,6.56v15.42a5,5,0,0,1-.79.23,4.4,4.4,0,0,1-1.09.13q-2.19,0-2.19-1.83V117.85A5.09,5.09,0,0,0,17.51,113.68Z"/><path class="cls-1" d="M59.21,113.52a5.83,5.83,0,0,0-3.82-1.17,8.57,8.57,0,0,0-5.9,2.34,7.73,7.73,0,0,1,.3,2.19v16.18a5.2,5.2,0,0,1-.78.23,4.48,4.48,0,0,1-1.1.13q-2.19,0-2.19-1.83v-14.4a4.48,4.48,0,0,0-1.42-3.67,5.92,5.92,0,0,0-3.87-1.17,9.26,9.26,0,0,0-3.08.51A11.51,11.51,0,0,0,34.89,114v19a5.39,5.39,0,0,1-.77.23,4.36,4.36,0,0,1-1.12.13c-1.46,0-2.18-.61-2.18-1.83V114.24a3.15,3.15,0,0,1,.43-1.71,5,5,0,0,1,1.5-1.4A15.75,15.75,0,0,1,40.48,109a12.43,12.43,0,0,1,4.43.74,6.72,6.72,0,0,1,3,2,11.28,11.28,0,0,1,3.31-2A12.29,12.29,0,0,1,55.7,109a10.23,10.23,0,0,1,6.56,2q2.45,2,2.44,6v16.08a5,5,0,0,1-.79.23,4.4,4.4,0,0,1-1.09.13q-2.19,0-2.19-1.83v-14.4A4.48,4.48,0,0,0,59.21,113.52Z"/><path class="cls-1" d="M88.92,126.91A6,6,0,0,1,86.53,132q-2.39,1.84-6.92,1.84a18,18,0,0,1-3.56-.33,12.58,12.58,0,0,1-2.77-.87,5.55,5.55,0,0,1-1.78-1.22,2,2,0,0,1-.64-1.4,2.25,2.25,0,0,1,.33-1.17,2.88,2.88,0,0,1,1-1,16.31,16.31,0,0,0,3.21,1.81,10.37,10.37,0,0,0,4.17.79q5.3,0,5.29-3.56c0-1.94-1.17-3.19-3.51-3.77L77.12,122a9.13,9.13,0,0,1-4.53-2.37,5.65,5.65,0,0,1-1.42-4,6.19,6.19,0,0,1,.53-2.54A5.75,5.75,0,0,1,73.35,111a8.31,8.31,0,0,1,2.78-1.45A12.56,12.56,0,0,1,80,109,13.4,13.4,0,0,1,85.77,110c1.46.69,2.19,1.5,2.19,2.41a2.06,2.06,0,0,1-1.22,1.94,15.77,15.77,0,0,0-2.6-1.32,10,10,0,0,0-4-.72,6.67,6.67,0,0,0-3.64.87,2.73,2.73,0,0,0-1.34,2.44,2.77,2.77,0,0,0,.76,2,4.91,4.91,0,0,0,2.54,1.23l3.51.86a11.08,11.08,0,0,1,5.19,2.57A6.15,6.15,0,0,1,88.92,126.91Z"/><path class="cls-1" d="M103.12,133.83a9.73,9.73,0,0,1-5.77-1.58q-2.22-1.58-2.22-5.24V102.84a5,5,0,0,1,.79-.23,4.69,4.69,0,0,1,1.14-.13c1.43,0,2.14.61,2.14,1.83v5.85h8.35a4.27,4.27,0,0,1,.3.69,2.85,2.85,0,0,1,.15.94c0,1.16-.5,1.73-1.52,1.73H99.2v13.23a3.32,3.32,0,0,0,1.15,2.88,5.38,5.38,0,0,0,3.23.84,6.88,6.88,0,0,0,1.93-.31,7.93,7.93,0,0,0,1.78-.71,3.26,3.26,0,0,1,.56.76,2.17,2.17,0,0,1,.26,1.07,2.08,2.08,0,0,1-1.33,1.83A7.71,7.71,0,0,1,103.12,133.83Z"/><path class="cls-1" d="M122.66,109a11.3,11.3,0,0,1,7,2q2.59,2,2.6,6.26V129.3a2.82,2.82,0,0,1-.44,1.7,4.37,4.37,0,0,1-1.29,1.1,13.31,13.31,0,0,1-3.23,1.24,17.9,17.9,0,0,1-4.61.54q-4.78,0-7.4-1.89a6.27,6.27,0,0,1-2.62-5.44,6,6,0,0,1,2.18-5.06,11.81,11.81,0,0,1,6.16-2.11l7.23-.72v-1.42a4.38,4.38,0,0,0-1.53-3.72,6.61,6.61,0,0,0-4.12-1.17,13.12,13.12,0,0,0-4,.61,22.11,22.11,0,0,0-3.36,1.38,4.86,4.86,0,0,1-.74-.82,1.67,1.67,0,0,1-.33-1,1.82,1.82,0,0,1,.36-1.17,3.3,3.3,0,0,1,1.12-.87,12.4,12.4,0,0,1,3.15-1.09A18.12,18.12,0,0,1,122.66,109Zm0,21.53a12.58,12.58,0,0,0,3.54-.43,8.48,8.48,0,0,0,2-.84v-7.38l-6.31.66a7.89,7.89,0,0,0-3.92,1.2,3.21,3.21,0,0,0-1.27,2.77,3.44,3.44,0,0,0,1.47,3A7.86,7.86,0,0,0,122.71,130.52Z"/><path class="cls-1" d="M147.74,133.83a9.75,9.75,0,0,1-5.77-1.58c-1.48-1.05-2.21-2.8-2.21-5.24V102.84a4.86,4.86,0,0,1,.78-.23,4.71,4.71,0,0,1,1.15-.13c1.42,0,2.14.61,2.14,1.83v5.85h8.34a4.2,4.2,0,0,1,.31.69,2.85,2.85,0,0,1,.15.94c0,1.16-.51,1.73-1.53,1.73h-7.27v13.23a3.35,3.35,0,0,0,1.14,2.88,5.4,5.4,0,0,0,3.23.84,7,7,0,0,0,1.94-.31,8.13,8.13,0,0,0,1.78-.71,3.57,3.57,0,0,1,.56.76,2.17,2.17,0,0,1,.25,1.07,2.08,2.08,0,0,1-1.32,1.83A7.76,7.76,0,0,1,147.74,133.83Z"/><path class="cls-1" d="M160.77,123.8q1.38,6.67,8.75,6.67a10.15,10.15,0,0,0,3.87-.71,11.71,11.71,0,0,0,2.75-1.53,2.16,2.16,0,0,1,1.22,1.93,2,2,0,0,1-.64,1.38,5.69,5.69,0,0,1-1.73,1.17,11.49,11.49,0,0,1-2.54.81,15.45,15.45,0,0,1-3.13.31q-5.91,0-9.34-3.21t-3.43-9.36a14.79,14.79,0,0,1,.84-5.17,11.07,11.07,0,0,1,2.34-3.84,10,10,0,0,1,3.59-2.42,12,12,0,0,1,4.52-.84,11.41,11.41,0,0,1,4.23.77,9.68,9.68,0,0,1,3.33,2.16,10.17,10.17,0,0,1,2.19,3.31,11,11,0,0,1,.79,4.2,2.13,2.13,0,0,1-.51,1.6,2.37,2.37,0,0,1-1.43.58Zm7-11.5a6.77,6.77,0,0,0-5.14,2.16,9.06,9.06,0,0,0-2.13,6.19l14-1.94a7.45,7.45,0,0,0-2-4.6A6.21,6.21,0,0,0,167.79,112.3Z"/><path class="cls-2" d="M66.92,13.13v9.39c1.27-.09,2.54-.16,3.83-.2V11.39h-.33a83.29,83.29,0,0,1,33.24-7.54V27.12c1.3.44,2.57.91,3.83,1.4V3.85A83,83,0,0,1,141.94,12V55.77h3.83V14c16.8,9.42,28.2,24.59,29.68,41.89h3.84C176.83,24.73,144.71,0,105.58,0c-26,0-48.84,10.89-62,27.31,2.27-.79,4.6-1.49,7-2.11A67.28,67.28,0,0,1,66.92,13.13Z"/><path class="cls-1" d="M144.69,59.61a53.84,53.84,0,0,1,6.79,22.69l28-22.6Z"/><path class="cls-2" d="M147.81,84.33a50.39,50.39,0,0,0-7.54-24.73c-7-11.59-18.58-21.08-32.78-27-1.25-.52-2.53-1-3.83-1.48A88.6,88.6,0,0,0,73.9,26.09c-1.05,0-2.11,0-3.15.06-1.29,0-2.56.11-3.83.21a87.58,87.58,0,0,0-21.08,4.21c-2.15.72-4.24,1.51-6.29,2.38C16.58,42.75.67,62.05,0,84.33v1.25c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,4.58,4.58,0,0,0,.73-.23V84.33h0c0-.47,0-.93.06-1.4.09-1.43.25-2.84.47-4.24a45.74,45.74,0,0,1,1.65-6.84C6.5,70.51,7,69.2,7.54,67.9c.37-.87.77-1.72,1.18-2.57a52.79,52.79,0,0,1,2.81-4.95,55.61,55.61,0,0,1,5.27-6.91c.32-.36.66-.72,1-1.08,1-1.08,2.07-2.12,3.17-3.14s2.25-2,3.44-2.94q2.37-1.91,5-3.61c.87-.57,1.75-1.13,2.65-1.66.45-.27.9-.54,1.36-.8l1.86-1v45.1h0v1.25c0,1.22.69,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,5.39,5.39,0,0,0,.73-.23V84.33h0l0-25V37.49h-.33l1.8-.82c.53-.23,1.08-.44,1.62-.66s.93-.39,1.4-.57q2.3-.88,4.68-1.64a84.66,84.66,0,0,1,18.68-3.59c1.27-.1,2.54-.17,3.83-.22l1.24,0V59.42l-.06,24.91h0v1.25c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,5,5,0,0,0,.73-.23V84.33h0V29.94A85.05,85.05,0,0,1,99.56,33.8c1.39.44,2.76.92,4.1,1.43.2.07.39.13.58.21,1,.39,2,.8,3,1.23l.23.11c.91.4,1.82.81,2.71,1.24l.07,0V84.33h0v1.25a.22.22,0,0,0,0,.08v.14h0c.08,1.07.77,1.61,2.07,1.61a4,4,0,0,0,1.07-.13,5,5,0,0,0,.73-.23V84.33h0l-.06-24.8V40.06l.33.18,1.37.8c.89.53,1.78,1.09,2.64,1.66q2.59,1.71,5,3.61c1.19.94,2.33,1.93,3.44,2.94S129,51.31,130,52.39l1,1.08a55.06,55.06,0,0,1,4.74,6.12l.52.79a50.64,50.64,0,0,1,2.81,4.95c.42.85.81,1.7,1.18,2.57.55,1.3,1.05,2.61,1.48,3.95a45.71,45.71,0,0,1,1.64,6.84,42.62,42.62,0,0,1,.48,4.24c0,.61,0,1.23.06,1.85v.8c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,4.58,4.58,0,0,0,.73-.23V84.33Z"/></g></g></svg> - mediatype: image/svg+xml + - base64data: <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.47 133.88"><defs><style>.cls-1{fill:#1d56d8;}.cls-2{fill:#70adef;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M17.51,113.68a6.5,6.5,0,0,0-4.3-1.33,11.7,11.7,0,0,0-3.61.51A13.67,13.67,0,0,0,6.9,114v19a5.18,5.18,0,0,1-.76.23,4.41,4.41,0,0,1-1.12.13q-2.19,0-2.19-1.83V114.24a3.23,3.23,0,0,1,.43-1.76,4.59,4.59,0,0,1,1.5-1.35,15.18,15.18,0,0,1,3.51-1.47,17.11,17.11,0,0,1,4.94-.67,11.56,11.56,0,0,1,7.3,2.09q2.67,2.08,2.67,6.56v15.42a5,5,0,0,1-.79.23,4.4,4.4,0,0,1-1.09.13q-2.19,0-2.19-1.83V117.85A5.09,5.09,0,0,0,17.51,113.68Z"/><path class="cls-1" d="M59.21,113.52a5.83,5.83,0,0,0-3.82-1.17,8.57,8.57,0,0,0-5.9,2.34,7.73,7.73,0,0,1,.3,2.19v16.18a5.2,5.2,0,0,1-.78.23,4.48,4.48,0,0,1-1.1.13q-2.19,0-2.19-1.83v-14.4a4.48,4.48,0,0,0-1.42-3.67,5.92,5.92,0,0,0-3.87-1.17,9.26,9.26,0,0,0-3.08.51A11.51,11.51,0,0,0,34.89,114v19a5.39,5.39,0,0,1-.77.23,4.36,4.36,0,0,1-1.12.13c-1.46,0-2.18-.61-2.18-1.83V114.24a3.15,3.15,0,0,1,.43-1.71,5,5,0,0,1,1.5-1.4A15.75,15.75,0,0,1,40.48,109a12.43,12.43,0,0,1,4.43.74,6.72,6.72,0,0,1,3,2,11.28,11.28,0,0,1,3.31-2A12.29,12.29,0,0,1,55.7,109a10.23,10.23,0,0,1,6.56,2q2.45,2,2.44,6v16.08a5,5,0,0,1-.79.23,4.4,4.4,0,0,1-1.09.13q-2.19,0-2.19-1.83v-14.4A4.48,4.48,0,0,0,59.21,113.52Z"/><path class="cls-1" d="M88.92,126.91A6,6,0,0,1,86.53,132q-2.39,1.84-6.92,1.84a18,18,0,0,1-3.56-.33,12.58,12.58,0,0,1-2.77-.87,5.55,5.55,0,0,1-1.78-1.22,2,2,0,0,1-.64-1.4,2.25,2.25,0,0,1,.33-1.17,2.88,2.88,0,0,1,1-1,16.31,16.31,0,0,0,3.21,1.81,10.37,10.37,0,0,0,4.17.79q5.3,0,5.29-3.56c0-1.94-1.17-3.19-3.51-3.77L77.12,122a9.13,9.13,0,0,1-4.53-2.37,5.65,5.65,0,0,1-1.42-4,6.19,6.19,0,0,1,.53-2.54A5.75,5.75,0,0,1,73.35,111a8.31,8.31,0,0,1,2.78-1.45A12.56,12.56,0,0,1,80,109,13.4,13.4,0,0,1,85.77,110c1.46.69,2.19,1.5,2.19,2.41a2.06,2.06,0,0,1-1.22,1.94,15.77,15.77,0,0,0-2.6-1.32,10,10,0,0,0-4-.72,6.67,6.67,0,0,0-3.64.87,2.73,2.73,0,0,0-1.34,2.44,2.77,2.77,0,0,0,.76,2,4.91,4.91,0,0,0,2.54,1.23l3.51.86a11.08,11.08,0,0,1,5.19,2.57A6.15,6.15,0,0,1,88.92,126.91Z"/><path class="cls-1" d="M103.12,133.83a9.73,9.73,0,0,1-5.77-1.58q-2.22-1.58-2.22-5.24V102.84a5,5,0,0,1,.79-.23,4.69,4.69,0,0,1,1.14-.13c1.43,0,2.14.61,2.14,1.83v5.85h8.35a4.27,4.27,0,0,1,.3.69,2.85,2.85,0,0,1,.15.94c0,1.16-.5,1.73-1.52,1.73H99.2v13.23a3.32,3.32,0,0,0,1.15,2.88,5.38,5.38,0,0,0,3.23.84,6.88,6.88,0,0,0,1.93-.31,7.93,7.93,0,0,0,1.78-.71,3.26,3.26,0,0,1,.56.76,2.17,2.17,0,0,1,.26,1.07,2.08,2.08,0,0,1-1.33,1.83A7.71,7.71,0,0,1,103.12,133.83Z"/><path class="cls-1" d="M122.66,109a11.3,11.3,0,0,1,7,2q2.59,2,2.6,6.26V129.3a2.82,2.82,0,0,1-.44,1.7,4.37,4.37,0,0,1-1.29,1.1,13.31,13.31,0,0,1-3.23,1.24,17.9,17.9,0,0,1-4.61.54q-4.78,0-7.4-1.89a6.27,6.27,0,0,1-2.62-5.44,6,6,0,0,1,2.18-5.06,11.81,11.81,0,0,1,6.16-2.11l7.23-.72v-1.42a4.38,4.38,0,0,0-1.53-3.72,6.61,6.61,0,0,0-4.12-1.17,13.12,13.12,0,0,0-4,.61,22.11,22.11,0,0,0-3.36,1.38,4.86,4.86,0,0,1-.74-.82,1.67,1.67,0,0,1-.33-1,1.82,1.82,0,0,1,.36-1.17,3.3,3.3,0,0,1,1.12-.87,12.4,12.4,0,0,1,3.15-1.09A18.12,18.12,0,0,1,122.66,109Zm0,21.53a12.58,12.58,0,0,0,3.54-.43,8.48,8.48,0,0,0,2-.84v-7.38l-6.31.66a7.89,7.89,0,0,0-3.92,1.2,3.21,3.21,0,0,0-1.27,2.77,3.44,3.44,0,0,0,1.47,3A7.86,7.86,0,0,0,122.71,130.52Z"/><path class="cls-1" d="M147.74,133.83a9.75,9.75,0,0,1-5.77-1.58c-1.48-1.05-2.21-2.8-2.21-5.24V102.84a4.86,4.86,0,0,1,.78-.23,4.71,4.71,0,0,1,1.15-.13c1.42,0,2.14.61,2.14,1.83v5.85h8.34a4.2,4.2,0,0,1,.31.69,2.85,2.85,0,0,1,.15.94c0,1.16-.51,1.73-1.53,1.73h-7.27v13.23a3.35,3.35,0,0,0,1.14,2.88,5.4,5.4,0,0,0,3.23.84,7,7,0,0,0,1.94-.31,8.13,8.13,0,0,0,1.78-.71,3.57,3.57,0,0,1,.56.76,2.17,2.17,0,0,1,.25,1.07,2.08,2.08,0,0,1-1.32,1.83A7.76,7.76,0,0,1,147.74,133.83Z"/><path class="cls-1" d="M160.77,123.8q1.38,6.67,8.75,6.67a10.15,10.15,0,0,0,3.87-.71,11.71,11.71,0,0,0,2.75-1.53,2.16,2.16,0,0,1,1.22,1.93,2,2,0,0,1-.64,1.38,5.69,5.69,0,0,1-1.73,1.17,11.49,11.49,0,0,1-2.54.81,15.45,15.45,0,0,1-3.13.31q-5.91,0-9.34-3.21t-3.43-9.36a14.79,14.79,0,0,1,.84-5.17,11.07,11.07,0,0,1,2.34-3.84,10,10,0,0,1,3.59-2.42,12,12,0,0,1,4.52-.84,11.41,11.41,0,0,1,4.23.77,9.68,9.68,0,0,1,3.33,2.16,10.17,10.17,0,0,1,2.19,3.31,11,11,0,0,1,.79,4.2,2.13,2.13,0,0,1-.51,1.6,2.37,2.37,0,0,1-1.43.58Zm7-11.5a6.77,6.77,0,0,0-5.14,2.16,9.06,9.06,0,0,0-2.13,6.19l14-1.94a7.45,7.45,0,0,0-2-4.6A6.21,6.21,0,0,0,167.79,112.3Z"/><path class="cls-2" d="M66.92,13.13v9.39c1.27-.09,2.54-.16,3.83-.2V11.39h-.33a83.29,83.29,0,0,1,33.24-7.54V27.12c1.3.44,2.57.91,3.83,1.4V3.85A83,83,0,0,1,141.94,12V55.77h3.83V14c16.8,9.42,28.2,24.59,29.68,41.89h3.84C176.83,24.73,144.71,0,105.58,0c-26,0-48.84,10.89-62,27.31,2.27-.79,4.6-1.49,7-2.11A67.28,67.28,0,0,1,66.92,13.13Z"/><path class="cls-1" d="M144.69,59.61a53.84,53.84,0,0,1,6.79,22.69l28-22.6Z"/><path class="cls-2" d="M147.81,84.33a50.39,50.39,0,0,0-7.54-24.73c-7-11.59-18.58-21.08-32.78-27-1.25-.52-2.53-1-3.83-1.48A88.6,88.6,0,0,0,73.9,26.09c-1.05,0-2.11,0-3.15.06-1.29,0-2.56.11-3.83.21a87.58,87.58,0,0,0-21.08,4.21c-2.15.72-4.24,1.51-6.29,2.38C16.58,42.75.67,62.05,0,84.33v1.25c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,4.58,4.58,0,0,0,.73-.23V84.33h0c0-.47,0-.93.06-1.4.09-1.43.25-2.84.47-4.24a45.74,45.74,0,0,1,1.65-6.84C6.5,70.51,7,69.2,7.54,67.9c.37-.87.77-1.72,1.18-2.57a52.79,52.79,0,0,1,2.81-4.95,55.61,55.61,0,0,1,5.27-6.91c.32-.36.66-.72,1-1.08,1-1.08,2.07-2.12,3.17-3.14s2.25-2,3.44-2.94q2.37-1.91,5-3.61c.87-.57,1.75-1.13,2.65-1.66.45-.27.9-.54,1.36-.8l1.86-1v45.1h0v1.25c0,1.22.69,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,5.39,5.39,0,0,0,.73-.23V84.33h0l0-25V37.49h-.33l1.8-.82c.53-.23,1.08-.44,1.62-.66s.93-.39,1.4-.57q2.3-.88,4.68-1.64a84.66,84.66,0,0,1,18.68-3.59c1.27-.1,2.54-.17,3.83-.22l1.24,0V59.42l-.06,24.91h0v1.25c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,5,5,0,0,0,.73-.23V84.33h0V29.94A85.05,85.05,0,0,1,99.56,33.8c1.39.44,2.76.92,4.1,1.43.2.07.39.13.58.21,1,.39,2,.8,3,1.23l.23.11c.91.4,1.82.81,2.71,1.24l.07,0V84.33h0v1.25a.22.22,0,0,0,0,.08v.14h0c.08,1.07.77,1.61,2.07,1.61a4,4,0,0,0,1.07-.13,5,5,0,0,0,.73-.23V84.33h0l-.06-24.8V40.06l.33.18,1.37.8c.89.53,1.78,1.09,2.64,1.66q2.59,1.71,5,3.61c1.19.94,2.33,1.93,3.44,2.94S129,51.31,130,52.39l1,1.08a55.06,55.06,0,0,1,4.74,6.12l.52.79a50.64,50.64,0,0,1,2.81,4.95c.42.85.81,1.7,1.18,2.57.55,1.3,1.05,2.61,1.48,3.95a45.71,45.71,0,0,1,1.64,6.84,42.62,42.62,0,0,1,.48,4.24c0,.61,0,1.23.06,1.85v.8c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,4.58,4.58,0,0,0,.73-.23V84.33Z"/></g></g></svg> + mediatype: image/svg+xml install: spec: clusterPermissions: - rules: - apiGroups: - - admissionregistration.k8s.io - resources: - - mutatingwebhookconfigurations - verbs: - - '*' - - apiGroups: - - rbac.authorization.k8s.io + - "" resources: - - clusterroles - - clusterrolebindings - - rolebindings - - roles + - configmaps + - namespaces + - serviceaccounts verbs: - '*' - apiGroups: - - nmstate.io + - admissionregistration.k8s.io resources: - - '*' + - mutatingwebhookconfigurations verbs: - '*' - apiGroups: @@ -76,18 +138,25 @@ spec: - apiGroups: - apps resources: - - deployments - daemonsets + - deployments - replicasets - statefulsets verbs: - '*' - apiGroups: - - "" + - nmstate.io resources: - - serviceaccounts - - configmaps - - namespaces + - '*' + verbs: + - '*' + - apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterrolebindings + - clusterroles + - rolebindings + - roles verbs: - '*' serviceAccountName: nmstate-operator @@ -125,9 +194,7 @@ spec: - name: HANDLER_IMAGE_PULL_POLICY value: Always - name: HANDLER_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] + value: nmstate image: quay.io/nmstate/kubernetes-nmstate-operator:latest imagePullPolicy: Always name: nmstate-operator @@ -144,20 +211,20 @@ spec: - apiGroups: - "" resources: - - services + - configmaps - endpoints - - persistentvolumeclaims - events - - configmaps - - secrets + - persistentvolumeclaims - pods + - secrets + - services verbs: - '*' - apiGroups: - apps resources: - - deployments - daemonsets + - deployments - replicasets - statefulsets verbs: diff --git a/bundle/manifests/nmstate-operator_v1_serviceaccount.yaml b/bundle/manifests/nmstate-operator_v1_serviceaccount.yaml deleted file mode 100644 index 468ca5c894..0000000000 --- a/bundle/manifests/nmstate-operator_v1_serviceaccount.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - creationTimestamp: null - labels: - nmstate.io: "" - name: nmstate-operator diff --git a/bundle/manifests/nmstate.io_nmstates.yaml b/bundle/manifests/nmstate.io_nmstates.yaml index 5dae12fdde..1b662acf33 100644 --- a/bundle/manifests/nmstate.io_nmstates.yaml +++ b/bundle/manifests/nmstate.io_nmstates.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 + controller-gen.kubebuilder.io/version: v0.6.0 creationTimestamp: null name: nmstates.nmstate.io spec: @@ -34,6 +34,58 @@ spec: spec: description: NMStateSpec defines the desired state of NMState properties: + infraNodeSelector: + additionalProperties: + type: string + description: InfraNodeSelector is an optional selector that will be + added to webhook & certmanager Deployment manifests If InfraNodeSelector + is specified, the webhook and certmanager will run only on nodes + that have each of the indicated key-value pairs as labels applied + to the node. + type: object + infraTolerations: + description: InfraTolerations is an optional list of tolerations to + be added to webhook & certmanager Deployment manifests If InfraTolerations + is specified, the webhook and certmanager will be able to be scheduled + on nodes with corresponding taints + items: + description: The pod this Toleration is attached to tolerates any + taint that matches the triple using the matching + operator . + properties: + effect: + description: Effect indicates the taint effect to match. Empty + means match all taint effects. When specified, allowed values + are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: + description: Key is the taint key that the toleration applies + to. Empty means match all taint keys. If the key is empty, + operator must be Exists; this combination means to match all + values and all keys. + type: string + operator: + description: Operator represents a key's relationship to the + value. Valid operators are Exists and Equal. Defaults to Equal. + Exists is equivalent to wildcard for value, so that a pod + can tolerate all taints of a particular category. + type: string + tolerationSeconds: + description: TolerationSeconds represents the period of time + the toleration (which must be of effect NoExecute, otherwise + this field is ignored) tolerates the taint. By default, it + is not set, which means tolerate the taint forever (do not + evict). Zero and negative values will be treated as 0 (evict + immediately) by the system. + format: int64 + type: integer + value: + description: Value is the taint value the toleration matches + to. If the operator is Exists, the value should be empty, + otherwise just a regular string. + type: string + type: object + type: array nodeSelector: additionalProperties: type: string @@ -44,6 +96,49 @@ spec: that have each of the indicated key-value pairs as labels applied to the node. type: object + tolerations: + description: Tolerations is an optional list of tolerations to be + added to handler DaemonSet manifest If Tolerations is specified, + the handler daemonset will be also scheduled on nodes with corresponding + taints + items: + description: The pod this Toleration is attached to tolerates any + taint that matches the triple using the matching + operator . + properties: + effect: + description: Effect indicates the taint effect to match. Empty + means match all taint effects. When specified, allowed values + are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: + description: Key is the taint key that the toleration applies + to. Empty means match all taint keys. If the key is empty, + operator must be Exists; this combination means to match all + values and all keys. + type: string + operator: + description: Operator represents a key's relationship to the + value. Valid operators are Exists and Equal. Defaults to Equal. + Exists is equivalent to wildcard for value, so that a pod + can tolerate all taints of a particular category. + type: string + tolerationSeconds: + description: TolerationSeconds represents the period of time + the toleration (which must be of effect NoExecute, otherwise + this field is ignored) tolerates the taint. By default, it + is not set, which means tolerate the taint forever (do not + evict). Zero and negative values will be treated as 0 (evict + immediately) by the system. + format: int64 + type: integer + value: + description: Value is the taint value the toleration matches + to. If the operator is Exists, the value should be empty, + otherwise just a regular string. + type: string + type: object + type: array type: object status: description: NMStateStatus defines the observed state of NMState @@ -59,6 +154,8 @@ spec: type: string message: type: string + messageEncoded: + type: string reason: type: string status: @@ -74,6 +171,164 @@ spec: type: object served: true storage: true + - deprecated: true + name: v1beta1 + schema: + openAPIV3Schema: + description: NMState is the Schema for the nmstates API + 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 + metadata: + type: object + spec: + description: NMStateSpec defines the desired state of NMState + properties: + infraNodeSelector: + additionalProperties: + type: string + description: InfraNodeSelector is an optional selector that will be + added to webhook & certmanager Deployment manifests If InfraNodeSelector + is specified, the webhook and certmanager will run only on nodes + that have each of the indicated key-value pairs as labels applied + to the node. + type: object + infraTolerations: + description: InfraTolerations is an optional list of tolerations to + be added to webhook & certmanager Deployment manifests If InfraTolerations + is specified, the webhook and certmanager will be able to be scheduled + on nodes with corresponding taints + items: + description: The pod this Toleration is attached to tolerates any + taint that matches the triple using the matching + operator . + properties: + effect: + description: Effect indicates the taint effect to match. Empty + means match all taint effects. When specified, allowed values + are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: + description: Key is the taint key that the toleration applies + to. Empty means match all taint keys. If the key is empty, + operator must be Exists; this combination means to match all + values and all keys. + type: string + operator: + description: Operator represents a key's relationship to the + value. Valid operators are Exists and Equal. Defaults to Equal. + Exists is equivalent to wildcard for value, so that a pod + can tolerate all taints of a particular category. + type: string + tolerationSeconds: + description: TolerationSeconds represents the period of time + the toleration (which must be of effect NoExecute, otherwise + this field is ignored) tolerates the taint. By default, it + is not set, which means tolerate the taint forever (do not + evict). Zero and negative values will be treated as 0 (evict + immediately) by the system. + format: int64 + type: integer + value: + description: Value is the taint value the toleration matches + to. If the operator is Exists, the value should be empty, + otherwise just a regular string. + type: string + type: object + type: array + nodeSelector: + additionalProperties: + type: string + description: NodeSelector is an optional selector that will be added + to handler DaemonSet manifest for both workers and control-plane + (https://github.com/nmstate/kubernetes-nmstate/blob/main/deploy/handler/operator.yaml). + If NodeSelector is specified, the handler will run only on nodes + that have each of the indicated key-value pairs as labels applied + to the node. + type: object + tolerations: + description: Tolerations is an optional list of tolerations to be + added to handler DaemonSet manifest If Tolerations is specified, + the handler daemonset will be also scheduled on nodes with corresponding + taints + items: + description: The pod this Toleration is attached to tolerates any + taint that matches the triple using the matching + operator . + properties: + effect: + description: Effect indicates the taint effect to match. Empty + means match all taint effects. When specified, allowed values + are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: + description: Key is the taint key that the toleration applies + to. Empty means match all taint keys. If the key is empty, + operator must be Exists; this combination means to match all + values and all keys. + type: string + operator: + description: Operator represents a key's relationship to the + value. Valid operators are Exists and Equal. Defaults to Equal. + Exists is equivalent to wildcard for value, so that a pod + can tolerate all taints of a particular category. + type: string + tolerationSeconds: + description: TolerationSeconds represents the period of time + the toleration (which must be of effect NoExecute, otherwise + this field is ignored) tolerates the taint. By default, it + is not set, which means tolerate the taint forever (do not + evict). Zero and negative values will be treated as 0 (evict + immediately) by the system. + format: int64 + type: integer + value: + description: Value is the taint value the toleration matches + to. If the operator is Exists, the value should be empty, + otherwise just a regular string. + type: string + type: object + type: array + type: object + status: + description: NMStateStatus defines the observed state of NMState + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + type: object + type: object + served: true + storage: false status: acceptedNames: kind: "" diff --git a/bundle/manifests/nmstate.io_nodenetworkconfigurationenactments.yaml b/bundle/manifests/nmstate.io_nodenetworkconfigurationenactments.yaml new file mode 100644 index 0000000000..0f91989006 --- /dev/null +++ b/bundle/manifests/nmstate.io_nodenetworkconfigurationenactments.yaml @@ -0,0 +1,160 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.6.0 + creationTimestamp: null + name: nodenetworkconfigurationenactments.nmstate.io +spec: + group: nmstate.io + names: + kind: NodeNetworkConfigurationEnactment + listKind: NodeNetworkConfigurationEnactmentList + plural: nodenetworkconfigurationenactments + shortNames: + - nnce + singular: nodenetworkconfigurationenactment + scope: Cluster + versions: + - additionalPrinterColumns: + - description: Status + jsonPath: .status.conditions[?(@.status=="True")].type + name: Status + type: string + deprecated: true + name: v1alpha1 + schema: + openAPIV3Schema: + description: NodeNetworkConfigurationEnactment is the Schema for the nodenetworkconfigurationenactments + API + 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 + metadata: + type: object + status: + description: NodeNetworkConfigurationEnactmentStatus defines the observed + state of NodeNetworkConfigurationEnactment + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + desiredState: + description: The desired state rendered for the enactment's node using + the policy desiredState as template + type: object + x-kubernetes-preserve-unknown-fields: true + policyGeneration: + description: The generation from policy needed to check if an enactment + condition status belongs to the same policy version + format: int64 + type: integer + type: object + type: object + served: true + storage: false + subresources: + status: {} + - additionalPrinterColumns: + - description: Status + jsonPath: .status.conditions[?(@.status=="True")].type + name: Status + type: string + name: v1beta1 + schema: + openAPIV3Schema: + description: NodeNetworkConfigurationEnactment is the Schema for the nodenetworkconfigurationenactments + API + 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 + metadata: + type: object + status: + description: NodeNetworkConfigurationEnactmentStatus defines the observed + state of NodeNetworkConfigurationEnactment + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + desiredState: + description: The desired state rendered for the enactment's node using + the policy desiredState as template + type: object + x-kubernetes-preserve-unknown-fields: true + policyGeneration: + description: The generation from policy needed to check if an enactment + condition status belongs to the same policy version + format: int64 + type: integer + type: object + type: object + x-kubernetes-preserve-unknown-fields: true + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/bundle/manifests/nmstate.io_nodenetworkconfigurationpolicies.yaml b/bundle/manifests/nmstate.io_nodenetworkconfigurationpolicies.yaml new file mode 100644 index 0000000000..f797687b54 --- /dev/null +++ b/bundle/manifests/nmstate.io_nodenetworkconfigurationpolicies.yaml @@ -0,0 +1,293 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.6.0 + creationTimestamp: null + name: nodenetworkconfigurationpolicies.nmstate.io +spec: + group: nmstate.io + names: + kind: NodeNetworkConfigurationPolicy + listKind: NodeNetworkConfigurationPolicyList + plural: nodenetworkconfigurationpolicies + shortNames: + - nncp + singular: nodenetworkconfigurationpolicy + scope: Cluster + versions: + - additionalPrinterColumns: + - description: Status + jsonPath: .status.conditions[?(@.status=="True")].type + name: Status + type: string + name: v1 + schema: + openAPIV3Schema: + description: NodeNetworkConfigurationPolicy is the Schema for the nodenetworkconfigurationpolicies + API + 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 + metadata: + type: object + spec: + description: NodeNetworkConfigurationPolicySpec defines the desired state + of NodeNetworkConfigurationPolicy + properties: + desiredState: + description: The desired configuration of the policy + type: object + x-kubernetes-preserve-unknown-fields: true + maxUnavailable: + anyOf: + - type: integer + - type: string + description: MaxUnavailable specifies percentage or number of machines + that can be updating at a time. Default is "50%". + x-kubernetes-int-or-string: true + nodeSelector: + additionalProperties: + type: string + description: 'NodeSelector is a selector which must be true for the + policy to be applied to the node. Selector which must match a node''s + labels for the policy to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/' + type: object + type: object + status: + description: NodeNetworkConfigurationPolicyStatus defines the observed + state of NodeNetworkConfigurationPolicy + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + lastUnavailableNodeCountUpdate: + description: LastUnavailableNodeCountUpdate is time of the last UnavailableNodeCount + update + format: date-time + type: string + unavailableNodeCount: + description: UnavailableNodeCount represents the total number of potentially + unavailable nodes that are processing a NodeNetworkConfigurationPolicy + type: integer + type: object + type: object + served: true + storage: true + subresources: + status: {} + - additionalPrinterColumns: + - description: Status + jsonPath: .status.conditions[?(@.status=="True")].type + name: Status + type: string + deprecated: true + name: v1alpha1 + schema: + openAPIV3Schema: + description: NodeNetworkConfigurationPolicy is the Schema for the nodenetworkconfigurationpolicies + API + 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 + metadata: + type: object + spec: + description: NodeNetworkConfigurationPolicySpec defines the desired state + of NodeNetworkConfigurationPolicy + properties: + desiredState: + description: The desired configuration of the policy + type: object + x-kubernetes-preserve-unknown-fields: true + maxUnavailable: + anyOf: + - type: integer + - type: string + description: MaxUnavailable specifies percentage or number of machines + that can be updating at a time. Default is "50%". + x-kubernetes-int-or-string: true + nodeSelector: + additionalProperties: + type: string + description: 'NodeSelector is a selector which must be true for the + policy to be applied to the node. Selector which must match a node''s + labels for the policy to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/' + type: object + type: object + status: + description: NodeNetworkConfigurationPolicyStatus defines the observed + state of NodeNetworkConfigurationPolicy + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + lastUnavailableNodeCountUpdate: + description: LastUnavailableNodeCountUpdate is time of the last UnavailableNodeCount + update + format: date-time + type: string + unavailableNodeCount: + description: UnavailableNodeCount represents the total number of potentially + unavailable nodes that are processing a NodeNetworkConfigurationPolicy + type: integer + type: object + type: object + served: true + storage: false + subresources: + status: {} + - additionalPrinterColumns: + - description: Status + jsonPath: .status.conditions[?(@.status=="True")].type + name: Status + type: string + deprecated: true + name: v1beta1 + schema: + openAPIV3Schema: + description: NodeNetworkConfigurationPolicy is the Schema for the nodenetworkconfigurationpolicies + API + 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 + metadata: + type: object + spec: + description: NodeNetworkConfigurationPolicySpec defines the desired state + of NodeNetworkConfigurationPolicy + properties: + desiredState: + description: The desired configuration of the policy + type: object + x-kubernetes-preserve-unknown-fields: true + maxUnavailable: + anyOf: + - type: integer + - type: string + description: MaxUnavailable specifies percentage or number of machines + that can be updating at a time. Default is "50%". + x-kubernetes-int-or-string: true + nodeSelector: + additionalProperties: + type: string + description: 'NodeSelector is a selector which must be true for the + policy to be applied to the node. Selector which must match a node''s + labels for the policy to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/' + type: object + type: object + status: + description: NodeNetworkConfigurationPolicyStatus defines the observed + state of NodeNetworkConfigurationPolicy + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + lastUnavailableNodeCountUpdate: + description: LastUnavailableNodeCountUpdate is time of the last UnavailableNodeCount + update + format: date-time + type: string + unavailableNodeCount: + description: UnavailableNodeCount represents the total number of potentially + unavailable nodes that are processing a NodeNetworkConfigurationPolicy + type: integer + type: object + type: object + served: true + storage: false + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/bundle/manifests/nmstate.io_nodenetworkstates.yaml b/bundle/manifests/nmstate.io_nodenetworkstates.yaml new file mode 100644 index 0000000000..5baadf2c8a --- /dev/null +++ b/bundle/manifests/nmstate.io_nodenetworkstates.yaml @@ -0,0 +1,157 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.6.0 + creationTimestamp: null + name: nodenetworkstates.nmstate.io +spec: + group: nmstate.io + names: + kind: NodeNetworkState + listKind: NodeNetworkStateList + plural: nodenetworkstates + shortNames: + - nns + singular: nodenetworkstate + scope: Cluster + versions: + - deprecated: true + name: v1alpha1 + schema: + openAPIV3Schema: + description: NodeNetworkState is the Schema for the nodenetworkstates API + 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 + metadata: + type: object + status: + description: NodeNetworkStateStatus is the status of the NodeNetworkState + of a specific node + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + currentState: + description: "State contains the namestatectl yaml [1] as string instead + of golang struct so we don't need to be in sync with the schema. + \n [1] https://github.com/nmstate/nmstate/blob/base/libnmstate/schemas/operational-state.yaml" + type: object + x-kubernetes-preserve-unknown-fields: true + handlerNetworkManagerVersion: + type: string + handlerNmstateVersion: + type: string + hostNetworkManagerVersion: + type: string + lastSuccessfulUpdateTime: + format: date-time + type: string + type: object + type: object + served: true + storage: false + subresources: + status: {} + - name: v1beta1 + schema: + openAPIV3Schema: + description: NodeNetworkState is the Schema for the nodenetworkstates API + 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 + metadata: + type: object + status: + description: NodeNetworkStateStatus is the status of the NodeNetworkState + of a specific node + properties: + conditions: + items: + properties: + lastHearbeatTime: + format: date-time + type: string + lastTransitionTime: + format: date-time + type: string + message: + type: string + messageEncoded: + type: string + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + currentState: + description: "State contains the namestatectl yaml [1] as string instead + of golang struct so we don't need to be in sync with the schema. + \n [1] https://github.com/nmstate/nmstate/blob/base/libnmstate/schemas/operational-state.yaml" + type: object + x-kubernetes-preserve-unknown-fields: true + handlerNetworkManagerVersion: + type: string + handlerNmstateVersion: + type: string + hostNetworkManagerVersion: + type: string + lastSuccessfulUpdateTime: + format: date-time + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 40bb3a1667..d5fc691a68 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -1,11 +1,14 @@ annotations: - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.manifests.v1: manifests/ + # Core bundle annotations. operators.operatorframework.io.bundle.mediatype.v1: registry+v1 + operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: kubernetes-nmstate - operators.operatorframework.io.metrics.builder: operator-sdk-unknown + operators.operatorframework.io.bundle.package.v1: kubernetes-nmstate-operator + operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.metrics.builder: operator-sdk-v1.13.0+git operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2 - operators.operatorframework.io.test.config.v1: tests/scorecard/ + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + + # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 + operators.operatorframework.io.test.config.v1: tests/scorecard/ diff --git a/bundle/tests/scorecard/.gitkeep b/bundle/tests/scorecard/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/cluster/sync.sh b/cluster/sync.sh index 83000b27aa..0ffe13c858 100755 --- a/cluster/sync.sh +++ b/cluster/sync.sh @@ -7,7 +7,7 @@ source ./cluster/sync-operator.sh kubectl=./cluster/kubectl.sh -nmstate_cr_manifest=deploy/crds/nmstate.io_v1_nmstate_cr.yaml +nmstate_cr_manifest=deploy/examples/nmstate.io_v1_nmstate_cr.yaml function deploy_handler() { $kubectl apply -f $nmstate_cr_manifest diff --git a/controllers/operator/nmstate_controller.go b/controllers/operator/nmstate_controller.go index 5a9bf69f30..602d8ac081 100644 --- a/controllers/operator/nmstate_controller.go +++ b/controllers/operator/nmstate_controller.go @@ -59,7 +59,7 @@ type NMStateReconciler struct { // +kubebuilder:rbac:groups=nmstate.io,resources="*",verbs="*" // +kubebuilder:rbac:groups=apiextensions.k8s.io,resources="*",verbs="*" // +kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;replicasets;statefulsets,verbs="*" -// +kubebuilder:rbac:groups="",resources=serviceaccounts;configmaps;namespaces;statefulsets,verbs="*" +// +kubebuilder:rbac:groups="",resources=serviceaccounts;configmaps;namespaces,verbs="*" func (r *NMStateReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = context.Background() diff --git a/deploy/bases/kubernetes-nmstate-operator.clusterserviceversion.yaml b/deploy/bases/kubernetes-nmstate-operator.clusterserviceversion.yaml new file mode 100644 index 0000000000..b7eac92ceb --- /dev/null +++ b/deploy/bases/kubernetes-nmstate-operator.clusterserviceversion.yaml @@ -0,0 +1,50 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + capabilities: Basic Install + categories: Networking + description: | + Kubernetes NMState is a declaritive means of configuring NetworkManager. + containerImage: quay.io/nmstate/kubernetes-nmstate-operator:latest + createdAt: "2021-11-24 16:05:00" + support: nmstate.io + repository: https://github.com/nmstate/kubernetes-nmstate + operatorframework.io/suggested-namespace: nmstate + operators.operatorframework.io/internal-objects: '["nodenetworkconfigurationenactments.nmstate.io", "nodenetworkstates.nmstate.io"]' + certified: "false" + name: kubernetes-nmstate-operator.v0.0.1 + namespace: placeholder +spec: + description: Kubernetes Nmstate description. + displayName: Kubernetes Nmstate + icon: + - base64data: >- + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.47 133.88"><defs><style>.cls-1{fill:#1d56d8;}.cls-2{fill:#70adef;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M17.51,113.68a6.5,6.5,0,0,0-4.3-1.33,11.7,11.7,0,0,0-3.61.51A13.67,13.67,0,0,0,6.9,114v19a5.18,5.18,0,0,1-.76.23,4.41,4.41,0,0,1-1.12.13q-2.19,0-2.19-1.83V114.24a3.23,3.23,0,0,1,.43-1.76,4.59,4.59,0,0,1,1.5-1.35,15.18,15.18,0,0,1,3.51-1.47,17.11,17.11,0,0,1,4.94-.67,11.56,11.56,0,0,1,7.3,2.09q2.67,2.08,2.67,6.56v15.42a5,5,0,0,1-.79.23,4.4,4.4,0,0,1-1.09.13q-2.19,0-2.19-1.83V117.85A5.09,5.09,0,0,0,17.51,113.68Z"/><path class="cls-1" d="M59.21,113.52a5.83,5.83,0,0,0-3.82-1.17,8.57,8.57,0,0,0-5.9,2.34,7.73,7.73,0,0,1,.3,2.19v16.18a5.2,5.2,0,0,1-.78.23,4.48,4.48,0,0,1-1.1.13q-2.19,0-2.19-1.83v-14.4a4.48,4.48,0,0,0-1.42-3.67,5.92,5.92,0,0,0-3.87-1.17,9.26,9.26,0,0,0-3.08.51A11.51,11.51,0,0,0,34.89,114v19a5.39,5.39,0,0,1-.77.23,4.36,4.36,0,0,1-1.12.13c-1.46,0-2.18-.61-2.18-1.83V114.24a3.15,3.15,0,0,1,.43-1.71,5,5,0,0,1,1.5-1.4A15.75,15.75,0,0,1,40.48,109a12.43,12.43,0,0,1,4.43.74,6.72,6.72,0,0,1,3,2,11.28,11.28,0,0,1,3.31-2A12.29,12.29,0,0,1,55.7,109a10.23,10.23,0,0,1,6.56,2q2.45,2,2.44,6v16.08a5,5,0,0,1-.79.23,4.4,4.4,0,0,1-1.09.13q-2.19,0-2.19-1.83v-14.4A4.48,4.48,0,0,0,59.21,113.52Z"/><path class="cls-1" d="M88.92,126.91A6,6,0,0,1,86.53,132q-2.39,1.84-6.92,1.84a18,18,0,0,1-3.56-.33,12.58,12.58,0,0,1-2.77-.87,5.55,5.55,0,0,1-1.78-1.22,2,2,0,0,1-.64-1.4,2.25,2.25,0,0,1,.33-1.17,2.88,2.88,0,0,1,1-1,16.31,16.31,0,0,0,3.21,1.81,10.37,10.37,0,0,0,4.17.79q5.3,0,5.29-3.56c0-1.94-1.17-3.19-3.51-3.77L77.12,122a9.13,9.13,0,0,1-4.53-2.37,5.65,5.65,0,0,1-1.42-4,6.19,6.19,0,0,1,.53-2.54A5.75,5.75,0,0,1,73.35,111a8.31,8.31,0,0,1,2.78-1.45A12.56,12.56,0,0,1,80,109,13.4,13.4,0,0,1,85.77,110c1.46.69,2.19,1.5,2.19,2.41a2.06,2.06,0,0,1-1.22,1.94,15.77,15.77,0,0,0-2.6-1.32,10,10,0,0,0-4-.72,6.67,6.67,0,0,0-3.64.87,2.73,2.73,0,0,0-1.34,2.44,2.77,2.77,0,0,0,.76,2,4.91,4.91,0,0,0,2.54,1.23l3.51.86a11.08,11.08,0,0,1,5.19,2.57A6.15,6.15,0,0,1,88.92,126.91Z"/><path class="cls-1" d="M103.12,133.83a9.73,9.73,0,0,1-5.77-1.58q-2.22-1.58-2.22-5.24V102.84a5,5,0,0,1,.79-.23,4.69,4.69,0,0,1,1.14-.13c1.43,0,2.14.61,2.14,1.83v5.85h8.35a4.27,4.27,0,0,1,.3.69,2.85,2.85,0,0,1,.15.94c0,1.16-.5,1.73-1.52,1.73H99.2v13.23a3.32,3.32,0,0,0,1.15,2.88,5.38,5.38,0,0,0,3.23.84,6.88,6.88,0,0,0,1.93-.31,7.93,7.93,0,0,0,1.78-.71,3.26,3.26,0,0,1,.56.76,2.17,2.17,0,0,1,.26,1.07,2.08,2.08,0,0,1-1.33,1.83A7.71,7.71,0,0,1,103.12,133.83Z"/><path class="cls-1" d="M122.66,109a11.3,11.3,0,0,1,7,2q2.59,2,2.6,6.26V129.3a2.82,2.82,0,0,1-.44,1.7,4.37,4.37,0,0,1-1.29,1.1,13.31,13.31,0,0,1-3.23,1.24,17.9,17.9,0,0,1-4.61.54q-4.78,0-7.4-1.89a6.27,6.27,0,0,1-2.62-5.44,6,6,0,0,1,2.18-5.06,11.81,11.81,0,0,1,6.16-2.11l7.23-.72v-1.42a4.38,4.38,0,0,0-1.53-3.72,6.61,6.61,0,0,0-4.12-1.17,13.12,13.12,0,0,0-4,.61,22.11,22.11,0,0,0-3.36,1.38,4.86,4.86,0,0,1-.74-.82,1.67,1.67,0,0,1-.33-1,1.82,1.82,0,0,1,.36-1.17,3.3,3.3,0,0,1,1.12-.87,12.4,12.4,0,0,1,3.15-1.09A18.12,18.12,0,0,1,122.66,109Zm0,21.53a12.58,12.58,0,0,0,3.54-.43,8.48,8.48,0,0,0,2-.84v-7.38l-6.31.66a7.89,7.89,0,0,0-3.92,1.2,3.21,3.21,0,0,0-1.27,2.77,3.44,3.44,0,0,0,1.47,3A7.86,7.86,0,0,0,122.71,130.52Z"/><path class="cls-1" d="M147.74,133.83a9.75,9.75,0,0,1-5.77-1.58c-1.48-1.05-2.21-2.8-2.21-5.24V102.84a4.86,4.86,0,0,1,.78-.23,4.71,4.71,0,0,1,1.15-.13c1.42,0,2.14.61,2.14,1.83v5.85h8.34a4.2,4.2,0,0,1,.31.69,2.85,2.85,0,0,1,.15.94c0,1.16-.51,1.73-1.53,1.73h-7.27v13.23a3.35,3.35,0,0,0,1.14,2.88,5.4,5.4,0,0,0,3.23.84,7,7,0,0,0,1.94-.31,8.13,8.13,0,0,0,1.78-.71,3.57,3.57,0,0,1,.56.76,2.17,2.17,0,0,1,.25,1.07,2.08,2.08,0,0,1-1.32,1.83A7.76,7.76,0,0,1,147.74,133.83Z"/><path class="cls-1" d="M160.77,123.8q1.38,6.67,8.75,6.67a10.15,10.15,0,0,0,3.87-.71,11.71,11.71,0,0,0,2.75-1.53,2.16,2.16,0,0,1,1.22,1.93,2,2,0,0,1-.64,1.38,5.69,5.69,0,0,1-1.73,1.17,11.49,11.49,0,0,1-2.54.81,15.45,15.45,0,0,1-3.13.31q-5.91,0-9.34-3.21t-3.43-9.36a14.79,14.79,0,0,1,.84-5.17,11.07,11.07,0,0,1,2.34-3.84,10,10,0,0,1,3.59-2.42,12,12,0,0,1,4.52-.84,11.41,11.41,0,0,1,4.23.77,9.68,9.68,0,0,1,3.33,2.16,10.17,10.17,0,0,1,2.19,3.31,11,11,0,0,1,.79,4.2,2.13,2.13,0,0,1-.51,1.6,2.37,2.37,0,0,1-1.43.58Zm7-11.5a6.77,6.77,0,0,0-5.14,2.16,9.06,9.06,0,0,0-2.13,6.19l14-1.94a7.45,7.45,0,0,0-2-4.6A6.21,6.21,0,0,0,167.79,112.3Z"/><path class="cls-2" d="M66.92,13.13v9.39c1.27-.09,2.54-.16,3.83-.2V11.39h-.33a83.29,83.29,0,0,1,33.24-7.54V27.12c1.3.44,2.57.91,3.83,1.4V3.85A83,83,0,0,1,141.94,12V55.77h3.83V14c16.8,9.42,28.2,24.59,29.68,41.89h3.84C176.83,24.73,144.71,0,105.58,0c-26,0-48.84,10.89-62,27.31,2.27-.79,4.6-1.49,7-2.11A67.28,67.28,0,0,1,66.92,13.13Z"/><path class="cls-1" d="M144.69,59.61a53.84,53.84,0,0,1,6.79,22.69l28-22.6Z"/><path class="cls-2" d="M147.81,84.33a50.39,50.39,0,0,0-7.54-24.73c-7-11.59-18.58-21.08-32.78-27-1.25-.52-2.53-1-3.83-1.48A88.6,88.6,0,0,0,73.9,26.09c-1.05,0-2.11,0-3.15.06-1.29,0-2.56.11-3.83.21a87.58,87.58,0,0,0-21.08,4.21c-2.15.72-4.24,1.51-6.29,2.38C16.58,42.75.67,62.05,0,84.33v1.25c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,4.58,4.58,0,0,0,.73-.23V84.33h0c0-.47,0-.93.06-1.4.09-1.43.25-2.84.47-4.24a45.74,45.74,0,0,1,1.65-6.84C6.5,70.51,7,69.2,7.54,67.9c.37-.87.77-1.72,1.18-2.57a52.79,52.79,0,0,1,2.81-4.95,55.61,55.61,0,0,1,5.27-6.91c.32-.36.66-.72,1-1.08,1-1.08,2.07-2.12,3.17-3.14s2.25-2,3.44-2.94q2.37-1.91,5-3.61c.87-.57,1.75-1.13,2.65-1.66.45-.27.9-.54,1.36-.8l1.86-1v45.1h0v1.25c0,1.22.69,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,5.39,5.39,0,0,0,.73-.23V84.33h0l0-25V37.49h-.33l1.8-.82c.53-.23,1.08-.44,1.62-.66s.93-.39,1.4-.57q2.3-.88,4.68-1.64a84.66,84.66,0,0,1,18.68-3.59c1.27-.1,2.54-.17,3.83-.22l1.24,0V59.42l-.06,24.91h0v1.25c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,5,5,0,0,0,.73-.23V84.33h0V29.94A85.05,85.05,0,0,1,99.56,33.8c1.39.44,2.76.92,4.1,1.43.2.07.39.13.58.21,1,.39,2,.8,3,1.23l.23.11c.91.4,1.82.81,2.71,1.24l.07,0V84.33h0v1.25a.22.22,0,0,0,0,.08v.14h0c.08,1.07.77,1.61,2.07,1.61a4,4,0,0,0,1.07-.13,5,5,0,0,0,.73-.23V84.33h0l-.06-24.8V40.06l.33.18,1.37.8c.89.53,1.78,1.09,2.64,1.66q2.59,1.71,5,3.61c1.19.94,2.33,1.93,3.44,2.94S129,51.31,130,52.39l1,1.08a55.06,55.06,0,0,1,4.74,6.12l.52.79a50.64,50.64,0,0,1,2.81,4.95c.42.85.81,1.7,1.18,2.57.55,1.3,1.05,2.61,1.48,3.95a45.71,45.71,0,0,1,1.64,6.84,42.62,42.62,0,0,1,.48,4.24c0,.61,0,1.23.06,1.85v.8c0,1.22.7,1.83,2.09,1.83a4,4,0,0,0,1.07-.13,4.58,4.58,0,0,0,.73-.23V84.33Z"/></g></g></svg> + mediatype: image/svg+xml + installModes: + - supported: true + type: OwnNamespace + - supported: true + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: false + type: AllNamespaces + keywords: + - nmstate + - networking + - NetworkManager + links: + - name: Kubernetes Nmstate Operator + url: https://github.com/nmstate/kubernetes-nmstate + maintainers: + - email: brad@redhat.com + name: Brad P. Crochet + maturity: alpha + provider: + name: NMState + selector: + matchLabels: + name: kubernetes-nmstate-operator + version: 0.0.1 diff --git a/deploy/crds/nmstate.io_v1beta1_nodenetworkconfigurationenactment_cr.yaml b/deploy/crds/nmstate.io_v1beta1_nodenetworkconfigurationenactment_cr.yaml deleted file mode 100644 index 86f30e99c2..0000000000 --- a/deploy/crds/nmstate.io_v1beta1_nodenetworkconfigurationenactment_cr.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: nmstate.io/v1beta1 -kind: NodeNetworkConfigurationEnactment -metadata: - creationTimestamp: "2019-12-04T10:55:12Z" - generation: 1 - name: node01.test-policy - ownerReferences: - - apiVersion: nmstate.io/v1 - kind: NodeNetworkConfigurationPolicy - name: test-policy - uid: d7e35a96-6094-4b2e-a899-9ee6a5eef157 - resourceVersion: "4682" - selfLink: /apis/nmstate.io/v1beta1/nodenetworkconfigurationenactments/node01.test-policy - uid: 2f255a93-c2b5-43a5-a401-7184150fa9f1 -status: - conditions: - - lastHearbeatTime: "2019-12-04T10:55:32Z" - lastTransitionTime: "2019-12-04T10:55:32Z" - reason: SuccessfullyConfigured - status: "False" - type: Progressing - - lastHearbeatTime: "2019-12-04T10:55:32Z" - lastTransitionTime: "2019-12-04T10:55:32Z" - reason: SuccessfullyConfigured - status: "False" - type: Failing - - lastHearbeatTime: "2019-12-04T10:55:32Z" - lastTransitionTime: "2019-12-04T10:55:32Z" - message: successfully reconciled - reason: SuccessfullyConfigured - status: "True" - type: Available diff --git a/deploy/crds/nmstate.io_v1beta1_nodenetworkstate_cr.yaml b/deploy/crds/nmstate.io_v1beta1_nodenetworkstate_cr.yaml deleted file mode 100644 index c667c505e1..0000000000 --- a/deploy/crds/nmstate.io_v1beta1_nodenetworkstate_cr.yaml +++ /dev/null @@ -1,188 +0,0 @@ -apiVersion: nmstate.io/v1beta1 -kind: NodeNetworkState -metadata: - creationTimestamp: "2019-12-03T08:31:04Z" - generation: 1 - name: node01 - ownerReferences: - - apiVersion: v1 - kind: Node - name: node01 - uid: d3c4563b-ece3-49a3-b0b6-81d12b112e89 - resourceVersion: "728" - selfLink: /apis/nmstate.io/v1beta1/nodenetworkstates/node01 - uid: d8b24483-3162-44ce-a335-666844569562 -status: - currentState: - dns-resolver: - config: - search: [] - server: [] - running: - search: [] - server: - - 192.168.66.2 - interfaces: - - bridge: - options: - group-forward-mask: 0 - mac-ageing-time: 300 - multicast-snooping: true - stp: - enabled: false - forward-delay: 15 - hello-time: 2 - max-age: 20 - priority: 32768 - port: [] - ipv4: - address: - - ip: 10.244.0.1 - prefix-length: 24 - dhcp: false - enabled: true - ipv6: - address: - - ip: fe80::5ccc:abff:fe0a:db1e - prefix-length: 64 - autoconf: false - dhcp: false - enabled: true - mac-address: 5E:CC:AB:0A:DB:1E - mtu: 1450 - name: cni0 - state: up - type: linux-bridge - - bridge: - options: - group-forward-mask: 0 - mac-ageing-time: 300 - multicast-snooping: true - stp: - enabled: false - forward-delay: 15 - hello-time: 2 - max-age: 20 - priority: 32768 - port: [] - ipv4: - address: - - ip: 172.17.0.1 - prefix-length: 16 - dhcp: false - enabled: true - ipv6: - autoconf: false - dhcp: false - enabled: false - mac-address: 02:42:DD:B5:49:60 - mtu: 1500 - name: docker0 - state: up - type: linux-bridge - - ipv4: - address: - - ip: 192.168.66.101 - prefix-length: 24 - auto-dns: true - auto-gateway: true - auto-routes: true - dhcp: true - enabled: true - ipv6: - address: - - ip: fe80::5055:ff:fed1:5501 - prefix-length: 64 - autoconf: false - dhcp: false - enabled: true - mac-address: 52:55:00:D1:55:01 - mtu: 1500 - name: eth0 - state: up - type: ethernet - - ipv4: - enabled: false - ipv6: - enabled: false - mac-address: 52:55:00:D1:56:00 - mtu: 1500 - name: eth1 - state: down - type: ethernet - - ipv4: - enabled: false - ipv6: - enabled: false - mac-address: 52:55:00:D1:56:01 - mtu: 1500 - name: eth2 - state: down - type: ethernet - - ipv4: - enabled: false - ipv6: - enabled: false - mac-address: 8A:58:1B:E1:ED:CA - mtu: 1450 - name: flannel.1 - state: down - type: vxlan - vxlan: - base-iface: eth0 - destination-port: 8472 - id: 1 - remote: "" - - ipv4: - enabled: false - ipv6: - enabled: false - mtu: 65536 - name: lo - state: down - type: unknown - route-rules: - config: [] - routes: - config: [] - running: - - destination: 10.244.0.0/24 - metric: 0 - next-hop-address: "" - next-hop-interface: cni0 - table-id: 254 - - destination: 172.17.0.0/16 - metric: 0 - next-hop-address: "" - next-hop-interface: docker0 - table-id: 254 - - destination: 0.0.0.0/0 - metric: 100 - next-hop-address: 192.168.66.2 - next-hop-interface: eth0 - table-id: 254 - - destination: 192.168.66.0/24 - metric: 100 - next-hop-address: "" - next-hop-interface: eth0 - table-id: 254 - - destination: fe80::/64 - metric: 256 - next-hop-address: "" - next-hop-interface: cni0 - table-id: 254 - - destination: fe80::/64 - metric: 100 - next-hop-address: "" - next-hop-interface: eth0 - table-id: 254 - - destination: ff00::/8 - metric: 256 - next-hop-address: "" - next-hop-interface: cni0 - table-id: 255 - - destination: ff00::/8 - metric: 256 - next-hop-address: "" - next-hop-interface: eth0 - table-id: 255 diff --git a/deploy/crds/nmstate.io_v1_nmstate_cr.yaml b/deploy/examples/nmstate.io_v1_nmstate_cr.yaml similarity index 100% rename from deploy/crds/nmstate.io_v1_nmstate_cr.yaml rename to deploy/examples/nmstate.io_v1_nmstate_cr.yaml diff --git a/deploy/crds/nmstate.io_v1_nodenetworkconfigurationpolicy_cr.yaml b/deploy/examples/nmstate.io_v1_nodenetworkconfigurationpolicy_cr.yaml similarity index 100% rename from deploy/crds/nmstate.io_v1_nodenetworkconfigurationpolicy_cr.yaml rename to deploy/examples/nmstate.io_v1_nodenetworkconfigurationpolicy_cr.yaml diff --git a/deploy/operator/role.yaml b/deploy/operator/role.yaml index 1fc938f804..4dc3c06bf4 100644 --- a/deploy/operator/role.yaml +++ b/deploy/operator/role.yaml @@ -12,7 +12,6 @@ rules: - configmaps - namespaces - serviceaccounts - - statefulsets verbs: - '*' - apiGroups: diff --git a/hack/render-manifests.go b/hack/render-manifests.go index 72aebfb4e5..748142ff5b 100644 --- a/hack/render-manifests.go +++ b/hack/render-manifests.go @@ -66,6 +66,11 @@ func main() { exitWithError(err, "failed parsing top dir operator manifests at %s", *inputDir) } + tmpl, err = tmpl.ParseGlob(path.Join(*inputDir, "examples/*.yaml")) + if err != nil { + exitWithError(err, "failed parsing sub dir example manifests at %s", *inputDir) + } + tmpl, err = tmpl.ParseGlob(path.Join(*inputDir, "openshift/*.yaml")) if err != nil { exitWithError(err, "failed parsing sub dir openshift manifests at %s", *inputDir)