Add controller submodule

Jordan Halterman · Jordan Halterman · commit ba3ac6d6ce90 · 2022-05-17T02:31:43.000-07:00
diff --git a/.github/workflows/controller.build.yml b/.github/workflows/controller.build.yml
@@ -0,0 +1,24 @@
+name: controller.build
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Docker Login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build
+        working-directory: controller
+        run: make build
diff --git a/.github/workflows/controller.release.yml b/.github/workflows/controller.release.yml
@@ -0,0 +1,27 @@
+name: controller.release
+
+on:
+  push:
+    tags:
+      - 'controller/v*'
+  pull_request:
+
+jobs:
+  release:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Docker Login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Setup Release Environment
+        run: |-
+          echo 'GITHUB_TOKEN=${{secrets.GH_TOKEN}}' > .release-env
+      - name: Release
+        working-directory: controller
+        run: make release
diff --git a/controller/Makefile b/controller/Makefile
@@ -4,6 +4,8 @@
 
 GOLANG_CROSS_VERSION := v1.18.1
 
+RUNTIME_VERSION := $(shell go run github.com/atomix/runtime/cmd/atomix-runtime-version@master)
+
 .PHONY: build
 build: build-bin build-docker
 
@@ -12,6 +14,7 @@ build-bin:
 		--rm \
 		--privileged \
 		-e CGO_ENABLED=1 \
+		-e RUNTIME_VERSION=$(RUNTIME_VERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/build \
 		-w /build \
@@ -23,6 +26,7 @@ build-docker:
 		--rm \
 		--privileged \
 		-e CGO_ENABLED=1 \
+		-e RUNTIME_VERSION=$(RUNTIME_VERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/build \
 		-w /build \
@@ -37,6 +41,7 @@ release-bin:
 		--rm \
 		--privileged \
 		-e CGO_ENABLED=1 \
+		-e RUNTIME_VERSION=$(RUNTIME_VERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/build \
 		-w /build \
@@ -48,6 +53,7 @@ release-docker:
 		--rm \
 		--privileged \
 		-e CGO_ENABLED=1 \
+		-e RUNTIME_VERSION=$(RUNTIME_VERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/build \
 		-w /build \
diff --git a/controller/README.md b/controller/README.md
@@ -0,0 +1,6 @@
+[![Build](https://github.com/atomix/runtime/actions/workflows/controller.build.yml/badge.svg)](https://github.com/atomix/runtime/actions/workflows/controller.build.yml)
+[![Go Report Card](https://goreportcard.com/badge/github.com/atomix/runtime/controller)](https://goreportcard.com/report/github.com/atomix/runtime/controller)
+[![GoDoc](https://godoc.org/github.com/atomix/runtime/controller?status.svg)](https://godoc.org/github.com/atomix/runtime/controller)
+
+# controller
+Runtime controller for Atomix Cloud
diff --git a/controller/build/bin.yaml b/controller/build/bin.yaml
@@ -28,7 +28,4 @@ builds:
       - all=-N -l
     ldflags:
       - -s -w
-      - -X github.com/atomix/runtime/pkg/version.shortCommit={{ .ShortCommit }}
-      - -X github.com/atomix/runtime/pkg/version.commit={{ .FullCommit }}
-      - -X github.com/atomix/runtime/pkg/version.version=v{{ .Version }}
-      - -X github.com/atomix/runtime/pkg/version.buildType={{ if .IsSnapshot }}snapshot{{ else }}release{{ end }}
+      - -X github.com/atomix/runtime/pkg/version.version={{ .Env.RUNTIME_VERSION }}
diff --git a/controller/build/codegen/boilerplate.go.txt b/controller/build/codegen/boilerplate.go.txt
@@ -0,0 +1,3 @@
+// SPDX-FileCopyrightText: 2022-present Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
diff --git a/controller/build/codegen/update-codegen.sh b/controller/build/codegen/update-codegen.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2022-present Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+CODEGEN_ROOT=$1
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+
+bash "${CODEGEN_ROOT}"/generate-groups.sh "deepcopy" \
+  ./pkg/apis ./pkg/apis \
+  atomix:v1beta1 \
+  --go-header-file "${SCRIPT_ROOT}"/build/codegen/boilerplate.go.txt
diff --git a/controller/build/docker.yaml b/controller/build/docker.yaml
@@ -15,7 +15,7 @@ builds:
 
 dockers:
   - id: atomix-controller
-    dockerfile: ./build/Dockerfile
+    dockerfile: ./build/controller/Dockerfile
     image_templates:
       - "atomix/controller:latest"
       - "{{ if (not .IsSnapshot) }}atomix/controller:{{ .Tag }}{{ end }}"
@@ -28,16 +28,3 @@ checksum:
 
 snapshot:
   name_template: "{{ incpatch .Version }}-{{.ShortCommit}}"
-
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-
-release:
-  github:
-    owner: atomix
-    name: runtime
-  prerelease: auto
-  draft: true
diff --git a/controller/cmd/atomix-controller/main.go b/controller/cmd/atomix-controller/main.go
@@ -1,9 +1,62 @@
-// SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+// SPDX-FileCopyrightText: 2022-present Intel Corporation
 //
 // SPDX-License-Identifier: Apache-2.0
 
 package main
 
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
+	"net"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
 func main() {
+	cmd := &cobra.Command{
+		Use: "atomix-controller",
+		Run: func(cmd *cobra.Command, args []string) {
+			host, err := cmd.Flags().GetString("host")
+			if err != nil {
+				fmt.Println(err)
+				os.Exit(1)
+			}
+			port, err := cmd.Flags().GetInt("port")
+			if err != nil {
+				fmt.Println(err)
+				os.Exit(1)
+			}
+
+			server := grpc.NewServer()
+
+			// TODO: Register services
+
+			lis, err := net.Listen("tcp", fmt.Sprintf("%s:%d", host, port))
+			if err != nil {
+				fmt.Fprintln(cmd.OutOrStderr(), err.Error())
+			}
+
+			go func() {
+				if err := server.Serve(lis); err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
+			}()
+
+			// Wait for an interrupt signal
+			ch := make(chan os.Signal, 2)
+			signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
+			<-ch
+
+			server.Stop()
+		},
+	}
+	cmd.Flags().StringP("host", "h", "", "the host to which to bind the controller server")
+	cmd.Flags().IntP("port", "p", 5678, "the port to which to bind the controller server")
 
+	if err := cmd.Execute(); err != nil {
+		panic(err)
+	}
 }
diff --git a/controller/go.mod b/controller/go.mod
@@ -1,3 +1,45 @@
 module github.com/atomix/runtime/controller
 
 go 1.18
+
+require (
+	github.com/atomix/api v0.0.0-20220517064555-1a41fdda0a79
+	github.com/atomix/sdk v0.0.3-0.20220517083411-a8ffd9bcf738
+	github.com/gofrs/flock v0.8.1
+	github.com/spf13/cobra v1.4.0
+	google.golang.org/grpc v1.46.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	k8s.io/apimachinery v0.24.0
+)
+
+require (
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.11.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
+	golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)
diff --git a/controller/pkg/apis/addtoscheme_atomix_v1beta1.go b/controller/pkg/apis/addtoscheme_atomix_v1beta1.go
@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2022-present Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package apis
+
+import (
+	atomixv1beta1 "github.com/atomix/runtime/controller/pkg/apis/atomix/v1beta1"
+)
+
+func init() {
+	// register the types with the Scheme so the components can map objects to GroupVersionKinds and back
+	AddToSchemes = append(AddToSchemes, atomixv1beta1.SchemeBuilder.AddToScheme)
+}
diff --git a/controller/pkg/apis/apis.go b/controller/pkg/apis/apis.go
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2022-present Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package apis
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// AddToSchemes may be used to add all resources defined in the project to a Scheme
+var AddToSchemes runtime.SchemeBuilder
+
+// AddToScheme adds all Resources to the Scheme
+func AddToScheme(s *runtime.Scheme) error {
+	return AddToSchemes.AddToScheme(s)
+}
diff --git a/controller/pkg/apis/atomix/v1beta1/doc.go b/controller/pkg/apis/atomix/v1beta1/doc.go
@@ -0,0 +1,8 @@
+// SPDX-FileCopyrightText: 2022-present Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+// Package v1beta1 contains API Schema definitions for the cloud v1beta1 API group
+// +k8s:deepcopy-gen=package,register
+// +groupName=atomix.io
+package v1beta1
diff --git a/controller/pkg/apis/atomix/v1beta1/register.go b/controller/pkg/apis/atomix/v1beta1/register.go
@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2022-present Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+// NOTE: Boilerplate only.  Ignore this file.
+
+// Package v1beta1 contains API Schema definitions for the cloud v1beta1 API group
+// +k8s:deepcopy-gen=package,register
+// +groupName=atomix.io
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: "atomix.io", Version: "v1beta1"}
+
+// Kind takes an unqualified kind and returns back a Group qualified GroupKind
+func Kind(kind string) schema.GroupKind {
+	return SchemeGroupVersion.WithKind(kind).GroupKind()
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+var (
+	// SchemeBuilder initializes a scheme builder
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	// AddToScheme is a global function that registers this API group & version to a scheme
+	AddToScheme = SchemeBuilder.AddToScheme
+)
+
+// Adds the list of known types to Scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion, &Cluster{}, &ClusterList{})
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
diff --git a/controller/pkg/apis/atomix/v1beta1/types.go b/controller/pkg/apis/atomix/v1beta1/types.go
@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Cluster is a specification for a Cluster resource
+type Cluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ClusterSpec   `json:"spec"`
+	Status ClusterStatus `json:"status"`
+}
+
+// ClusterSpec is the spec for a Cluster resource
+type ClusterSpec struct {
+}
+
+// ClusterStatus is the status for a Cluster resource
+type ClusterStatus struct {
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ClusterList is a list of Cluster resources
+type ClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+
+	Items []Cluster `json:"items"`
+}
diff --git a/controller/pkg/apis/atomix/v1beta1/zz_generated.deepcopy.go b/controller/pkg/apis/atomix/v1beta1/zz_generated.deepcopy.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// SPDX-FileCopyrightText: 2022-present Intel Corporation`
	`2`	`+//`
	`3`	`+// SPDX-License-Identifier: Apache-2.0`