diff --git a/build/Dockerfile.operator.openshift b/build/Dockerfile.operator.openshift index e4a911342..5129241cc 100644 --- a/build/Dockerfile.operator.openshift +++ b/build/Dockerfile.operator.openshift @@ -12,9 +12,13 @@ COPY deploy/handler/operator.yaml /bindata/kubernetes-nmstate/handler/handler.ya COPY deploy/handler/service_account.yaml /bindata/kubernetes-nmstate/rbac/ COPY deploy/handler/role.yaml /bindata/kubernetes-nmstate/rbac/ COPY deploy/handler/role_binding.yaml /bindata/kubernetes-nmstate/rbac/ +COPY --from=builder /go/src/github.com/openshift/kubernetes-nmstate/manifests /manifests +COPY --from=builder /go/src/github.com/openshift/kubernetes-nmstate/metadata /metadata ENTRYPOINT ["manager"] LABEL io.k8s.display-name="kubernetes-nmstate-operator" \ io.k8s.description="Operator for Node network configuration through Kubernetes API" \ + io.openshift.tags="openshift,kubernetes-nmstate-operator" \ + com.redhat.delivery.appregistry=true \ maintainer="Yossi Boaron " diff --git a/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml b/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml index 3cf25d072..5517a6438 100644 --- a/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml +++ b/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml @@ -122,7 +122,7 @@ spec: - name: PROFILER_PORT value: "6060" - name: RUN_OPERATOR - - name: RELATED_IMAGE_HANDLER_IMAGE + - name: HANDLER_IMAGE value: quay.io/nmstate/kubernetes-nmstate-handler:latest - name: HANDLER_IMAGE_PULL_POLICY value: Always diff --git a/controllers/nmstate_controller.go b/controllers/nmstate_controller.go index 953796f6f..a9157c2e8 100644 --- a/controllers/nmstate_controller.go +++ b/controllers/nmstate_controller.go @@ -138,7 +138,7 @@ func (r *NMStateReconciler) applyNamespace(instance *nmstatev1beta1.NMState) err func (r *NMStateReconciler) applyRBAC(instance *nmstatev1beta1.NMState) error { data := render.MakeRenderData() data.Data["HandlerNamespace"] = os.Getenv("HANDLER_NAMESPACE") - data.Data["HandlerImage"] = os.Getenv("RELATED_IMAGE_HANDLER_IMAGE") + data.Data["HandlerImage"] = os.Getenv("HANDLER_IMAGE") data.Data["HandlerPullPolicy"] = os.Getenv("HANDLER_IMAGE_PULL_POLICY") data.Data["HandlerPrefix"] = os.Getenv("HANDLER_PREFIX") return r.renderAndApply(instance, data, "rbac", true) @@ -165,7 +165,7 @@ func (r *NMStateReconciler) applyHandler(instance *nmstatev1beta1.NMState) error amd64AndCRNodeSelector["beta.kubernetes.io/arch"] = "amd64" data.Data["HandlerNamespace"] = os.Getenv("HANDLER_NAMESPACE") - data.Data["HandlerImage"] = os.Getenv("RELATED_IMAGE_HANDLER_IMAGE") + data.Data["HandlerImage"] = os.Getenv("HANDLER_IMAGE") data.Data["HandlerPullPolicy"] = os.Getenv("HANDLER_IMAGE_PULL_POLICY") data.Data["HandlerPrefix"] = os.Getenv("HANDLER_PREFIX") data.Data["WebhookNodeSelector"] = amd64ArchOnMasterNodeSelector diff --git a/controllers/nmstate_controller_test.go b/controllers/nmstate_controller_test.go index 26784738a..ef9f18b0a 100644 --- a/controllers/nmstate_controller_test.go +++ b/controllers/nmstate_controller_test.go @@ -63,7 +63,7 @@ var _ = Describe("NMState controller reconcile", func() { reconciler.Scheme = s reconciler.Log = ctrl.Log.WithName("controllers").WithName("NMState") os.Setenv("HANDLER_NAMESPACE", handlerNamespace) - os.Setenv("RELATED_IMAGE_HANDLER_IMAGE", handlerImage) + os.Setenv("HANDLER_IMAGE", handlerImage) os.Setenv("HANDLER_IMAGE_PULL_POLICY", imagePullPolicy) os.Setenv("HANDLER_PREFIX", handlerPrefix) }) diff --git a/deploy/operator/operator.yaml b/deploy/operator/operator.yaml index ecc006d2a..5268447c0 100644 --- a/deploy/operator/operator.yaml +++ b/deploy/operator/operator.yaml @@ -44,7 +44,7 @@ spec: value: "6060" - name: RUN_OPERATOR value: "" - - name: RELATED_IMAGE_HANDLER_IMAGE + - name: HANDLER_IMAGE value: {{ .HandlerImage }} - name: HANDLER_IMAGE_PULL_POLICY value: {{ .HandlerPullPolicy }} diff --git a/manifests/4.7/image-references b/manifests/4.7/image-references new file mode 100644 index 000000000..5c6f20a0d --- /dev/null +++ b/manifests/4.7/image-references @@ -0,0 +1,13 @@ +--- +kind: ImageStream +apiVersion: image.openshift.io/v1 +spec: + tags: + - name: kubernetes-nmstate-operator + from: + kind: DockerImage + name: quay.io/openshift/origin-kubernetes-nmstate-operator:4.7 + - name: kubernetes-nmstate-handler + from: + kind: DockerImage + name: quay.io/openshift/origin-kubernetes-nmstate-handler:4.7 \ No newline at end of file diff --git a/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml b/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml new file mode 100644 index 000000000..291ffd354 --- /dev/null +++ b/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml @@ -0,0 +1,219 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + alm-examples: |- + [{ + "apiVersion": "nmstate.io/v1beta1", + "kind": "NMState", + "metadata": { + "name": "nmstate" + }, + "spec": { + "nodeSelector": { + "beta.kubernetes.io/arch": "amd64" + } + } + }] + capabilities: Basic Install + certified: "false" + categories: OpenShift Optional + description: | + Kubernetes NMState is a declaritive means of configuring NetworkManager. + containerImage: quay.io/openshift/origin-kubernetes-nmstate-operator:4.7 + createdAt: 2020-011-12 17:13:03 + olm.skipRange: ">=4.3.0-0 < 4.7.0-0" + support: Red Hat, Inc. + repository: https://github.com/openshift/kubernetes-nmstate + name: kubernetes-nmstate-operator.v4.7.0 + namespace: openshift-nmstate +spec: + apiservicedefinitions: {} + customresourcedefinitions: + owned: + - kind: NMState + name: nmstates.nmstate.io + version: v1beta1 + description: Represents an NMState deployment. + displayName: NMState + description: A Kubernetes Operator to install Kubernetes NMState + displayName: Kubernetes NMState Operator + 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 + install: + spec: + clusterPermissions: + - rules: + - apiGroups: + - admissionregistration.k8s.io + resources: + - mutatingwebhookconfigurations + verbs: + - '*' + - apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterroles + - clusterrolebindings + - rolebindings + - roles + verbs: + - '*' + - apiGroups: + - nmstate.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - apiextensions.k8s.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - apps + resources: + - deployments + - daemonsets + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - "" + resources: + - serviceaccounts + - configmaps + - namespaces + verbs: + - '*' + - apiGroups: + - security.openshift.io + resources: + - securitycontextconstraints + verbs: + - use + resourceNames: + - privileged + serviceAccountName: nmstate-operator + deployments: + - name: nmstate-operator + spec: + replicas: 1 + selector: + matchLabels: + name: kubernetes-nmstate-operator + strategy: {} + template: + metadata: + labels: + app: kubernetes-nmstate-operator + name: kubernetes-nmstate-operator + spec: + containers: + - args: + - --v=production + command: + - manager + env: + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.annotations['olm.targetNamespaces'] + - name: OPERATOR_NAME + value: kubernetes-nmstate-operator + - name: ENABLE_PROFILER + value: "False" + - name: PROFILER_PORT + value: "6060" + - name: RUN_OPERATOR + - name: HANDLER_IMAGE + value: quay.io/openshift/origin-kubernetes-nmstate-handler:4.7 + - name: HANDLER_IMAGE_PULL_POLICY + value: Always + - name: HANDLER_NAMESPACE + value: openshift-nmstate + image: quay.io/openshift/origin-kubernetes-nmstate-operator:4.7 + imagePullPolicy: Always + name: nmstate-operator + resources: {} + nodeSelector: + node-role.kubernetes.io/master: "" + serviceAccountName: nmstate-operator + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + operator: Exists + permissions: + - rules: + - apiGroups: + - "" + resources: + - services + - endpoints + - persistentvolumeclaims + - events + - configmaps + - secrets + - pods + verbs: + - '*' + - apiGroups: + - apps + resources: + - deployments + - daemonsets + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - '*' + serviceAccountName: nmstate-operator + - rules: + - apiGroups: + - security.openshift.io + resources: + - securitycontextconstraints + verbs: + - use + resourceNames: + - privileged + serviceAccountName: nmstate-handler + strategy: deployment + 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: support@redhat.com + name: Red Hat + maturity: beta + provider: + name: Red Hat, Inc. + selector: + matchLabels: + name: kubernetes-nmstate-operator + version: 4.7.0 + labels: + olm-owner-enterprise-app: kubernetes-nmstate-operator + olm-status-descriptors: kubernetes-nmstate-operator.v4.7.0 diff --git a/manifests/4.7/nmstate-operator_v1_serviceaccount.yaml b/manifests/4.7/nmstate-operator_v1_serviceaccount.yaml new file mode 100644 index 000000000..c41ae47fd --- /dev/null +++ b/manifests/4.7/nmstate-operator_v1_serviceaccount.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + creationTimestamp: null + labels: + nmstate.io: "" + name: nmstate-operator + diff --git a/manifests/4.7/nmstate.io_nmstates.yaml b/manifests/4.7/nmstate.io_nmstates.yaml new file mode 100644 index 000000000..462bb9896 --- /dev/null +++ b/manifests/4.7/nmstate.io_nmstates.yaml @@ -0,0 +1,73 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.4.0 + creationTimestamp: null + name: nmstates.nmstate.io +spec: + group: nmstate.io + names: + kind: NMState + listKind: NMStateList + plural: nmstates + singular: nmstate + scope: Cluster + versions: + - 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: + nodeSelector: + additionalProperties: + type: string + description: NodeSelector is an optional selector that will be added to handler DaemonSet manifest for both workers and masters (https://github.com/nmstate/kubernetes-nmstate/blob/master/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 + 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 + reason: + type: string + status: + type: string + type: + type: string + required: + - status + - type + type: object + type: array + type: object + type: object + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/manifests/art.yaml b/manifests/art.yaml new file mode 100644 index 000000000..19c5d1a7a --- /dev/null +++ b/manifests/art.yaml @@ -0,0 +1,15 @@ +updates: + - file: "{MAJOR}.{MINOR}/kubernetes-nmstate-operator.v{MAJOR}.{MINOR}.0.clusterserviceversion.yaml" # relative to this file + update_list: + # replace metadata.name value + - search: "kubernetesnmstateoperator.v{MAJOR}.{MINOR}.0" + replace: "kubernetesnmstateoperator.{FULL_VER}" + # replace entire version line, otherwise would replace {MAJOR}.{MINOR}.0 anywhere + - search: "version: {MAJOR}.{MINOR}.0" + replace: "version: {FULL_VER}" + - search: 'olm.skipRange: ">=4.4.0 <{MAJOR}.{MINOR}.0"' + replace: 'olm.skipRange: ">=4.4.0 <{FULL_VER}"' + - file: "kubernetes-nmstate-operator.package.yaml" + update_list: + - search: "currentCSV: kubernetes-nmstate-operator.v{MAJOR}.{MINOR}.0" + replace: "currentCSV: kubernetes-nmstate-operator.{FULL_VER}" \ No newline at end of file diff --git a/manifests/kubernetes-nmstate-operator.package.yaml b/manifests/kubernetes-nmstate-operator.package.yaml new file mode 100644 index 000000000..c4a062ac1 --- /dev/null +++ b/manifests/kubernetes-nmstate-operator.package.yaml @@ -0,0 +1,4 @@ +packageName: kubernetes-nmstate-operator +channels: + - name: "4.7" + currentCSV: kubernetes-nmstate-operator.v4.7.0 diff --git a/metadata/annotations.yaml b/metadata/annotations.yaml new file mode 100644 index 000000000..a027fcd97 --- /dev/null +++ b/metadata/annotations.yaml @@ -0,0 +1,7 @@ +annotations: + operators.operatorframework.io.bundle.channel.default.v1: "beta" + operators.operatorframework.io.bundle.channels.v1: "beta" + operators.operatorframework.io.bundle.manifests.v1: manifests/ + operators.operatorframework.io.bundle.mediatype.v1: registry+v1 + operators.operatorframework.io.bundle.metadata.v1: metadata/ + operators.operatorframework.io.bundle.package.v1: "kubernetes-nmstate-operator"