Merge pull request nmstate#167 from bcrochet/master-bump

Bump to latest upstream

.github/workflows/github-pages.yml

@@ -0,0 +1,25 @@
+name: Build and deploy Jekyll site to GitHub Pages
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  github-pages:
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v2
+      # Use GitHub Actions' cache to shorten build times and decrease load on servers.
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - uses: helaili/jekyll-action@master
+        env:
+          JEKYLL_PAT: ${{ secrets.JEKYLL_PAT }}
+        with:
+          jekyll_src: 'docs'
+          gem_src: 'docs'

CONTRIBUTING.md

@@ -48,7 +48,7 @@ make DEV_IMAGE_REGISTRY=quay.io IMAGE_REPO=foo cluster-sync
 
 ```shell
 # If pkg/apis/ has been changed, run generator to update client code
-make gen-k8s gen-openapi
+make gen-k8s
 
 # Build handler operator (both its binary and docker image)
 make handler

Makefile

@@ -30,7 +30,7 @@ export KUBEVIRT_NUM_SECONDARY_NICS ?= 2
 
 export E2E_TEST_TIMEOUT ?= 40m
 
-e2e_test_args = -test.v -test.timeout=$(E2E_TEST_TIMEOUT) -ginkgo.v -ginkgo.slowSpecThreshold=60 $(E2E_TEST_ARGS)
+e2e_test_args = -v -timeout=$(E2E_TEST_TIMEOUT) -slowSpecThreshold=60 $(E2E_TEST_ARGS)
 
 ifeq ($(findstring k8s,$(KUBEVIRT_PROVIDER)),k8s)
 export PRIMARY_NIC ?= eth0
@@ -54,9 +54,8 @@ export KUBECONFIG ?= $(shell ./cluster/kubeconfig.sh)
 export SSH ?= ./cluster/ssh.sh
 export KUBECTL ?= ./cluster/kubectl.sh
 
+KUBECTL ?= ./cluster/kubectl.sh
 GINKGO ?= $(GOBIN)/ginkgo
-OPERATOR_SDK ?= $(GOBIN)/operator-sdk
-OPENAPI_GEN ?= $(GOBIN)/openapi-gen
 CONTROLLER_GEN ?= $(GOBIN)/controller-gen
 export GITHUB_RELEASE ?= $(GOBIN)/github-release
 export RELEASE_NOTES ?= $(GOBIN)/release-notes
@@ -96,8 +95,6 @@ $(GO):
 
 $(GINKGO): go.mod
 	$(MAKE) tools
-$(OPERATOR_SDK): go.mod
-	$(MAKE) tools
 $(OPENAPI_GEN): go.mod
 	$(MAKE) tools
 $(GITHUB_RELEASE): go.mod
@@ -110,23 +107,18 @@ $(CONTROLLER_GEN): go.mod
 gen-k8s: $(CONTROLLER_GEN)
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
-gen-openapi: $(OPENAPI_GEN)
-	$(OPENAPI_GEN) --logtostderr=true -o "" -i ./api/v1alpha1 -O zz_generated.openapi -p ./api/v1alpha1 -h ./hack/boilerplate.go.txt -r "-"
-	$(OPENAPI_GEN) --logtostderr=true -o "" -i ./api/v1beta1 -O zz_generated.openapi -p ./api/v1beta1 -h ./hack/boilerplate.go.txt -r "-"
-	$(OPENAPI_GEN) --logtostderr=true -o "" -i ./api/shared -O zz_generated.openapi -p ./api/shared -h ./hack/boilerplate.go.txt -r "-"
-
 gen-crds: $(CONTROLLER_GEN)
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=deploy/crds
 
 check-gen: generate
 	./hack/check-gen.sh
 
-generate: gen-openapi gen-k8s gen-crds
+generate: gen-k8s gen-crds
 
 manifests: $(GO)
 	$(GO) run hack/render-manifests.go -handler-prefix=$(HANDLER_PREFIX) -handler-namespace=$(HANDLER_NAMESPACE) -operator-namespace=$(OPERATOR_NAMESPACE) -handler-image=$(HANDLER_IMAGE) -operator-image=$(OPERATOR_IMAGE) -handler-pull-policy=$(HANDLER_PULL_POLICY) -operator-pull-policy=$(OPERATOR_PULL_POLICY) -input-dir=deploy/ -output-dir=$(MANIFESTS_DIR)
 
-manager: $(OPERATOR_SDK)
+manager: $(GO)
 	$(GO) build -o $(BIN_DIR)/manager main.go
 
 handler: manager
@@ -135,7 +127,7 @@ handler: manager
 push-handler: handler
 	$(IMAGE_BUILDER) push $(HANDLER_IMAGE)
 
-operator: handler
+operator: manager
 	$(IMAGE_BUILDER) build . -f build/Dockerfile.operator -t $(OPERATOR_IMAGE)
 
 push-operator: operator
@@ -145,11 +137,11 @@ push: push-handler push-operator
 test/unit: $(GINKGO)
 	INTERFACES_FILTER="" NODE_NAME=node01 $(GINKGO) $(unit_test_args) $(WHAT)
 
-test-e2e-handler: $(OPERATOR_SDK)
-	OPERATOR_SDK="$(OPERATOR_SDK)" TEST_ARGS="$(e2e_test_args)" ./hack/run-e2e-test-handler.sh
+test-e2e-handler: $(GINKGO)
+	KUBECONFIG=$(shell ./cluster/kubeconfig.sh) $(GINKGO) $(e2e_test_args) ./test/e2e/handler ... -- $(E2E_TEST_SUITE_ARGS)
 
-test-e2e-operator: manifests $(OPERATOR_SDK)
-	OPERATOR_SDK="$(OPERATOR_SDK)" TEST_ARGS="$(e2e_test_args)" KUBECTL=$(KUBECTL) MANIFESTS_DIR=$(MANIFESTS_DIR) ./hack/run-e2e-test-operator.sh
+test-e2e-operator: manifests $(GINKGO)
+	KUBECONFIG=$(shell ./cluster/kubeconfig.sh) $(GINKGO) $(e2e_test_args) ./test/e2e/operator ... -- $(E2E_TEST_SUITE_ARGS)
 
 test-e2e: test-e2e-operator test-e2e-handler
 

OWNERS

@@ -7,10 +7,10 @@ reviewers:
   - qinqon
   - oshoval
   - AlonaKaplan
-  - eranco74
-  - tsorya
   - bcrochet
   - yboaron
+  - RamLavi
+  - rhrazdil
 
 # Bugzilla info;
 component: Networking

PROJECT

@@ -0,0 +1,11 @@
+domain: nmstate.io
+layout: go.kubebuilder.io/v2
+projectName: kubernetes-nmstate
+repo: github.com/nmstate/kubernetes-nmstate
+resources:
+- group: nmstate.io
+  kind: NMState
+  version: v1beta1
+version: 3-alpha
+plugins:
+  go.sdk.operatorframework.io/v2-alpha: {}

api/shared/condition_types.go

@@ -7,10 +7,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// +k8s:openapi-gen=true
 type ConditionList []Condition
 
-// +k8s:openapi-gen=true
 type Condition struct {
 	Type               ConditionType          `json:"type"`
 	Status             corev1.ConditionStatus `json:"status"`
@@ -20,10 +18,8 @@ type Condition struct {
 	LastTransitionTime metav1.Time            `json:"lastTransitionTime,omitempty"`
 }
 
-// +k8s:openapi-gen=true
 type ConditionType string
 
-// +k8s:openapi-gen=true
 type ConditionReason string
 
 func NewCondition(conditionType ConditionType, status corev1.ConditionStatus, reason ConditionReason, message string) Condition {

api/shared/nodenetworkconfigurationenactment_types.go

@@ -7,7 +7,6 @@ import (
 )
 
 // NodeNetworkConfigurationEnactmentStatus defines the observed state of NodeNetworkConfigurationEnactment
-// +k8s:openapi-gen=true
 type NodeNetworkConfigurationEnactmentStatus struct {
 	// +kubebuilder:validation:XPreserveUnknownFields
 	// The desired state rendered for the enactment's node using

api/shared/nodenetworkconfigurationpolicy_types.go

@@ -1,7 +1,6 @@
 package shared
 
 // NodeNetworkConfigurationPolicySpec defines the desired state of NodeNetworkConfigurationPolicy
-// +k8s:openapi-gen=true
 type NodeNetworkConfigurationPolicySpec struct {
 	// 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.
@@ -15,7 +14,6 @@ type NodeNetworkConfigurationPolicySpec struct {
 }
 
 // NodeNetworkConfigurationPolicyStatus defines the observed state of NodeNetworkConfigurationPolicy
-// +k8s:openapi-gen=true
 type NodeNetworkConfigurationPolicyStatus struct {
 	Conditions ConditionList `json:"conditions,omitempty" optional:"true"`
 }

api/shared/nodenetworkstate_types.go

@@ -5,7 +5,6 @@ import (
 )
 
 // NodeNetworkStateStatus is the status of the NodeNetworkState of a specific node
-// +k8s:openapi-gen=true
 type NodeNetworkStateStatus struct {
 	// +kubebuilder:validation:XPreserveUnknownFields
 	CurrentState             State       `json:"currentState,omitempty"`

api/shared/state_types.go

@@ -8,7 +8,7 @@ type RawState []byte
 // so we don't need to be in sync with the schema.
 //
 // [1] https://github.com/nmstate/nmstate/blob/master/libnmstate/schemas/operational-state.yaml
-// +k8s:openapi-gen=true
+// +kubebuilder:validation:Type=object
 type State struct {
 	Raw RawState `json:"-"`
 }