Skip to content

Openshift machine api #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Feb 1, 2019
Merged

Openshift machine api #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
672481a
Changes for cluster-api-actuator-pkg to support machine.openshift.io
enxebre Jan 31, 2019
7d493df
Revendor for machine.openshift.io
enxebre Jan 31, 2019
b673340
Drop cluster.k8s.io and introduce machine.openshift.io
enxebre Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
COPY . .
RUN go build -o ./machine-controller-manager ./cmd/manager
RUN go build -o ./manager ./vendor/sigs.k8s.io/cluster-api/cmd/manager
RUN go build -o ./manager ./vendor/github.com/openshift/cluster-api/cmd/manager

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
RUN INSTALL_PKGS=" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
COPY . .
RUN go build -o ./machine-controller-manager ./cmd/manager
RUN go build -o ./manager ./vendor/sigs.k8s.io/cluster-api/cmd/manager
RUN go build -o ./manager ./vendor/github.com/openshift/cluster-api/cmd/manager

FROM registry.svc.ci.openshift.org/ocp/4.0:base
RUN INSTALL_PKGS=" \
Expand Down
56 changes: 25 additions & 31 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 31 additions & 9 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,41 @@ required = [
version = "v1.15.5"

[[override]]
name = "sigs.k8s.io/cluster-api"
branch = "master"
name = "k8s.io/kube-aggregator"
branch = "release-1.10"

[[override]]
#branch = "master"
name = "github.com/openshift/cluster-api-actuator-pkg"
revision = "6983d93876009e8c004dfe7868c1dece4a9d1137"
name = "github.com/openshift/cluster-api"
revision = "91fca585a85b163ddfd119fd09c128c9feadddca"

# STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE.
[[override]]
name = "k8s.io/code-generator"
# revision for tag "kubernetes-1.11.2"
revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a"

[[constraint]]
name="sigs.k8s.io/controller-runtime"
version="v0.1.1"
[[override]]
name = "k8s.io/api"
# revision for tag "kubernetes-1.11.2"
Copy link
Member

@ingvagabund ingvagabund Feb 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version = "kubernetes-1.11.2" does not work? The same for other override's cases.

Copy link
Member Author

@enxebre enxebre Feb 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is consolidating with mao. In a follow up we need to pin all to 1.12.* https://jira.coreos.com/browse/CLOUD-367

revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"

[[override]]
name = "k8s.io/apiextensions-apiserver"
# revision for tag "kubernetes-1.11.2"
revision = "408db4a50408e2149acbd657bceb2480c13cb0a4"

[[override]]
name = "k8s.io/apimachinery"
# revision for tag "kubernetes-1.11.2"
revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"

[[override]]
name = "k8s.io/client-go"
# revision for tag "kubernetes-1.11.2"
revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"

[[override]]
name = "sigs.k8s.io/controller-runtime"
version = "v0.1.4"

[[constraint]]
name="sigs.k8s.io/controller-tools"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ bin:

.PHONY: build
build: ## build binaries
$(DOCKER_CMD) go build $(GOGCFLAGS) -o bin/manager -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/manager
$(DOCKER_CMD) go build $(GOGCFLAGS) -o bin/machine-controller-manager -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/vendor/sigs.k8s.io/cluster-api/cmd/manager
$(DOCKER_CMD) go build $(GOGCFLAGS) -o bin/machine-controller-manager -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/manager
$(DOCKER_CMD) go build $(GOGCFLAGS) -o bin/manager -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/vendor/github.com/openshift/cluster-api/cmd/manager

aws-actuator:
$(DOCKER_CMD) go build $(GOGCFLAGS) -o bin/aws-actuator sigs.k8s.io/cluster-api-provider-aws/cmd/aws-actuator
Expand Down
14 changes: 7 additions & 7 deletions cmd/aws-actuator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ import (

"github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework"
"github.com/openshift/cluster-api-actuator-pkg/pkg/manifests"
machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/actuators/machine"
awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/client"
testutils "sigs.k8s.io/cluster-api-provider-aws/test/utils"
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
)

const (
Expand All @@ -56,7 +56,7 @@ const (

func init() {
// Add types to scheme
clusterv1.AddToScheme(scheme.Scheme)
machinev1.AddToScheme(scheme.Scheme)

rootCmd.PersistentFlags().StringP("machine", "m", "", "Machine manifest")
rootCmd.PersistentFlags().StringP("cluster", "c", "", "Cluster manifest")
Expand Down Expand Up @@ -240,17 +240,17 @@ func bootstrapCommand() *cobra.Command {
},
}

testCluster := &clusterv1.Cluster{
testCluster := &machinev1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: machinePrefix,
Namespace: testNamespace.Name,
},
Spec: clusterv1.ClusterSpec{
ClusterNetwork: clusterv1.ClusterNetworkingConfig{
Services: clusterv1.NetworkRanges{
Spec: machinev1.ClusterSpec{
ClusterNetwork: machinev1.ClusterNetworkingConfig{
Services: machinev1.NetworkRanges{
CIDRBlocks: []string{"10.0.0.1/24"},
},
Pods: clusterv1.NetworkRanges{
Pods: machinev1.NetworkRanges{
CIDRBlocks: []string{"10.0.0.1/24"},
},
ServiceDomain: "example.com",
Expand Down
12 changes: 6 additions & 6 deletions cmd/aws-actuator/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework"
machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/actuators/machine"
"sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1"
awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/client"
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
)

type manifestParams struct {
ClusterID string
}

func readMachineManifest(manifestParams *manifestParams, manifestLoc string) (*clusterv1.Machine, error) {
machine := &clusterv1.Machine{}
func readMachineManifest(manifestParams *manifestParams, manifestLoc string) (*machinev1.Machine, error) {
machine := &machinev1.Machine{}
manifestBytes, err := ioutil.ReadFile(manifestLoc)
if err != nil {
return nil, fmt.Errorf("unable to read %v: %v", manifestLoc, err)
Expand All @@ -51,13 +51,13 @@ func readMachineManifest(manifestParams *manifestParams, manifestLoc string) (*c
return machine, nil
}

func readClusterResources(manifestParams *manifestParams, clusterLoc, machineLoc, awsCredentialSecretLoc, userDataLoc string) (*clusterv1.Cluster, *clusterv1.Machine, *apiv1.Secret, *apiv1.Secret, error) {
func readClusterResources(manifestParams *manifestParams, clusterLoc, machineLoc, awsCredentialSecretLoc, userDataLoc string) (*machinev1.Cluster, *machinev1.Machine, *apiv1.Secret, *apiv1.Secret, error) {
machine, err := readMachineManifest(manifestParams, machineLoc)
if err != nil {
return nil, nil, nil, nil, err
}

cluster := &clusterv1.Cluster{}
cluster := &machinev1.Cluster{}
bytes, err := ioutil.ReadFile(clusterLoc)
if err != nil {
return nil, nil, nil, nil, fmt.Errorf("cluster manifest %q: %v", clusterLoc, err)
Expand Down Expand Up @@ -110,7 +110,7 @@ func createSecretAndWait(f *framework.Framework, secret *apiv1.Secret) error {
}

// CreateActuator creates actuator with fake clientsets
func createActuator(machine *clusterv1.Machine, awsCredentials, userData *apiv1.Secret) (*machineactuator.Actuator, error) {
func createActuator(machine *machinev1.Machine, awsCredentials, userData *apiv1.Secret) (*machineactuator.Actuator, error) {
objList := []runtime.Object{machine}
if awsCredentials != nil {
objList = append(objList, awsCredentials)
Expand Down
4 changes: 2 additions & 2 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"fmt"

"github.com/golang/glog"
clusterapis "github.com/openshift/cluster-api/pkg/apis"
"github.com/openshift/cluster-api/pkg/controller/machine"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"k8s.io/klog"
machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/actuators/machine"
"sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1"
awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/client"
clusterapis "sigs.k8s.io/cluster-api/pkg/apis"
"sigs.k8s.io/cluster-api/pkg/controller/machine"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
Expand Down
Loading