Skip to content

Commit

Permalink
Merge pull request #160 from slintes/update-coordination-version
Browse files Browse the repository at this point in the history
Update coordination version
  • Loading branch information
slintes authored Jun 18, 2021
2 parents 00dfbf5 + d815bb6 commit 431d98d
Show file tree
Hide file tree
Showing 9 changed files with 369 additions and 59 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export OPERATOR_SDK_VERSION = v0.18.2
export OPM_VERSION = v1.12.7

# The last released version (without v)
export OPERATOR_VERSION_LAST ?= 0.9.0
export OPERATOR_VERSION_LAST ?= 0.9.1
# The version of the next release (without v)
export OPERATOR_VERSION_NEXT ?= 0.10.0
# The OLM channel this operator should be default of
Expand Down
13 changes: 6 additions & 7 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM golang:1.15 AS builder
WORKDIR /go/src/kubevirt.io/node-maintenance-operator/
ENV GOPATH=/go
FROM registry.access.redhat.com/ubi8/go-toolset:1.15.7 AS builder
WORKDIR /opt/app-root/src
COPY . .

RUN make build
Expand All @@ -11,16 +10,16 @@ ENV OPERATOR=/usr/local/bin/node-maintenance-operator \
USER_NAME=node-maintenance-operator

# install operator binary
COPY --from=builder /go/src/kubevirt.io/node-maintenance-operator/_out/node-maintenance-operator ${OPERATOR}
COPY --from=builder /opt/app-root/src/_out/node-maintenance-operator ${OPERATOR}

# install scripts
COPY --from=builder /go/src/kubevirt.io/node-maintenance-operator/build/bin /usr/local/bin
COPY --from=builder /opt/app-root/src/build/bin /usr/local/bin
RUN /usr/local/bin/user_setup

# needed for HCO
LABEL org.kubevirt.hco.csv-generator.v1="/usr/local/bin/csv-generator"
COPY --from=builder /go/src/kubevirt.io/node-maintenance-operator/build/hco/csv-generator /usr/local/bin/
COPY --from=builder /go/src/kubevirt.io/node-maintenance-operator/manifests/node-maintenance-operator/v9.9.9/manifests /manifests
COPY --from=builder /opt/app-root/src/build/hco/csv-generator /usr/local/bin/
COPY --from=builder /opt/app-root/src/manifests/node-maintenance-operator/v9.9.9/manifests /manifests

ENTRYPOINT ["/usr/local/bin/entrypoint"]

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: nodemaintenances.nodemaintenance.kubevirt.io
spec:
group: nodemaintenance.kubevirt.io
names:
kind: NodeMaintenance
listKind: NodeMaintenanceList
plural: nodemaintenances
singular: nodemaintenance
scope: Cluster
versions:
- name: v1beta1
schema:
openAPIV3Schema:
description: NodeMaintenance is the Schema for the nodemaintenances 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: NodeMaintenanceSpec defines the desired state of NodeMaintenance
properties:
nodeName:
description: Node name to apply maintanance on/off
type: string
reason:
description: Reason for maintanance
type: string
required:
- nodeName
type: object
status:
description: NodeMaintenanceStatus defines the observed state of NodeMaintenance
properties:
errorOnLeaseCount:
description: Consecutive number of errors upon obtaining a lease
type: integer
evictionPods:
description: EvictionPods is the total number of pods up for eviction
from the start
type: integer
lastError:
description: LastError represents the latest error if any in the latest
reconciliation
type: string
pendingPods:
description: PendingPods is a list of pending pods for eviction
items:
type: string
type: array
phase:
description: Phase is the represtation of the maintenance progress
(Running,Succeeded,Failed)
type: string
totalpods:
description: TotalPods is the total number of all pods on the node
from the start
type: integer
type: object
type: object
served: true
storage: true
subresources:
status: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
annotations:
operators.operatorframework.io.bundle.channel.default.v1: "4.8"
operators.operatorframework.io.bundle.channels.v1: "4.8"
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: node-maintenance-operator
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
packageName: node-maintenance-operator
channels:
- name: "4.8"
currentCSV: node-maintenance-operator.v0.9.1
Loading

0 comments on commit 431d98d

Please sign in to comment.