Use machine API types

cmd/wing/cmd/agent.go

@@ -4,10 +4,11 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/jetstack/tarmak/pkg/apis/wing/common"
 	"github.com/jetstack/tarmak/pkg/wing"
 )
 
-var agentFlags = &wing.Flags{}
+var agentFlags = &common.Flags{}
 
 var agentCmd = &cobra.Command{
 	Use: "agent",
@@ -21,7 +22,8 @@ func init() {
 	agentCmd.Flags().StringVar(&agentFlags.ClusterName, "cluster-name", "myenv-mycluster", "this specifies the cluster name [environment]-[cluster]")
 	agentCmd.Flags().StringVar(&agentFlags.ServerURL, "server-url", "https://localhost:9443", "this specifies the URL to the wing server")
 	agentCmd.Flags().StringVar(&agentFlags.ManifestURL, "manifest-url", "", "this specifies the URL where the puppet.tar.gz can be found")
-	agentCmd.Flags().StringVar(&agentFlags.InstanceName, "instance-name", wing.DefaultInstanceName, "this specifies the instance's name")
+	agentCmd.Flags().StringVar(&agentFlags.MachineName, "instance-name", wing.DefaultMachineName, "this specifies the instance's name")
+	agentCmd.Flags().StringVar(&agentFlags.Pool, "pool", "", "this specifies the instance pool the machine resides in, used as a label selector")
 
 	RootCmd.AddCommand(agentCmd)
 }

docs/generated/cmd/wing/wing_agent.rst

@@ -24,6 +24,7 @@ Options
   -h, --help                   help for agent
       --instance-name string   this specifies the instance's name (default "$(hostname)")
       --manifest-url string    this specifies the URL where the puppet.tar.gz can be found
+      --pool string            this specifies the instance pool the machine resides in, used as a label selector
       --server-url string      this specifies the URL to the wing server (default "https://localhost:9443")
 
 Options inherited from parent commands

docs/generated/cmd/wing/wing_server.rst

@@ -20,7 +20,7 @@ Options
 
 ::
 
-      --admission-control strings                        Admission is divided into two phases. In the first phase, only mutating admission plugins run. In the second phase, only validating admission plugins run. The names in the below list may represent a validating plugin, a mutating plugin, or both. Within each phase, the plugins will run in the order in which they are passed to this flag. Comma-delimited list of: Initializers, InstanceInitTime, MutatingAdmissionWebhook, NamespaceLifecycle, ValidatingAdmissionWebhook. (default [InstanceInitTime])
+      --admission-control strings                        Admission is divided into two phases. In the first phase, only mutating admission plugins run. In the second phase, only validating admission plugins run. The names in the below list may represent a validating plugin, a mutating plugin, or both. Within each phase, the plugins will run in the order in which they are passed to this flag. Comma-delimited list of: Initializers, MachineDeploymentInitTime, MachineInitTime, MachineSetInitTime, MutatingAdmissionWebhook, NamespaceLifecycle, ValidatingAdmissionWebhook. (default [MachineInitTime,MachineSetInitTime,MachineDeploymentInitTime])
       --admission-control-config-file string             File with admission control configuration.
       --bind-address ip                                  The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank, all interfaces will be used (0.0.0.0). (default 0.0.0.0)
       --cert-dir string                                  The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "apiserver.local.config/certificates")

docs/generated/reference/config.yaml

@@ -19,6 +19,12 @@ resource_categories:
   - name: "Cluster"
     version: "v1alpha1"
     group: "cluster"
-  - name: "Instance"
+  - name: "Machine"
+    version: "v1alpha1"
+    group: "wing"
+  - name: "MachineSet"
+    version: "v1alpha1"
+    group: "wing"
+  - name: "MachineDeployment"
     version: "v1alpha1"
     group: "wing"

hack/update-cmd-docs.sh

@@ -33,13 +33,13 @@ OUTPUT_DIR="${CMD_ROOT}"
 BINDIR=$REPO_ROOT/bin
 HACKDIR=$REPO_ROOT/hack
 
+echo "+++ Building cmd-gen"
+go build -o ${BINDIR}/cmd-gen ./hack/cmd-gen
+
 echo "+++ Removing old output"
 rm -Rf "${OUTPUT_DIR}"
 mkdir -p "${OUTPUT_DIR}"
 
-echo "+++ Building cmd-gen"
-go build -o ${BINDIR}/cmd-gen ./hack/cmd-gen
-
 echo "+++ Running cmd-gen"
 ${BINDIR}/cmd-gen ${OUTPUT_DIR}
 

pkg/apis/wing/common/consts.go

@@ -0,0 +1,24 @@
+// Copyright Jetstack Ltd. See LICENSE for details.
+package common
+
+const (
+	MachineManifestStateConverging = MachineManifestState("converging")
+	MachineManifestStateConverged  = MachineManifestState("converged")
+	MachineManifestStateError      = MachineManifestState("error")
+
+	// Replace the old MachineSet by new one using rolling update
+	// i.e gradually scale down the old MachineSet and scale up the new one.
+	RollingUpdateMachineDeploymentStrategyType MachineDeploymentStrategyType = "RollingUpdate"
+)
+
+type MachineStatusError string
+type MachineManifestState string
+type MachineDeploymentStrategyType string
+
+type Flags struct {
+	ManifestURL string
+	ServerURL   string
+	ClusterName string
+	MachineName string
+	Pool        string
+}

pkg/apis/wing/types.go → pkg/apis/wing/machine_types.go

@@ -3,45 +3,43 @@ package wing
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/jetstack/tarmak/pkg/apis/wing/common"
 )
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type Instance struct {
+type Machine struct {
 	metav1.TypeMeta
 	metav1.ObjectMeta
 
-	InstanceID   string
-	InstancePool string
-
-	Spec   *InstanceSpec
-	Status *InstanceStatus
+	Spec   *MachineSpec
+	Status *MachineStatus
 }
 
-// InstanceSpec defines the desired state of Instance
-type InstanceSpec struct {
-	Converge *InstanceSpecManifest
-	DryRun   *InstanceSpecManifest
+// MachineSpec defines the desired state of Machine
+type MachineSpec struct {
+	Converge *MachineSpecManifest
+	DryRun   *MachineSpecManifest
 }
 
 //  InstaceSpecManifest defines location and hash for a specific manifest
-type InstanceSpecManifest struct {
+type MachineSpecManifest struct {
 	Path             string
 	Hash             string
 	RequestTimestamp metav1.Time
 }
 
-// InstanceStatus defines the observed state of Instance
-type InstanceStatus struct {
-	Converge *InstanceStatusManifest
-	DryRun   *InstanceStatusManifest
+// MachineStatus defines the observed state of Machine
+type MachineStatus struct {
+	Converge *MachineStatusManifest
+	DryRun   *MachineStatusManifest
 }
 
 //  InstaceSpecManifest defines the state and hash of a run manifest
-type InstanceManifestState string
-type InstanceStatusManifest struct {
-	State               InstanceManifestState
+type MachineStatusManifest struct {
+	State               common.MachineManifestState
 	Hash                string
 	LastUpdateTimestamp metav1.Time
 	Messages            []string
@@ -50,10 +48,10 @@ type InstanceStatusManifest struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type InstanceList struct {
+type MachineList struct {
 	metav1.TypeMeta
 	// +optional
 	metav1.ListMeta
 
-	Items []Instance
+	Items []Machine
 }