Skip to content

WIP: migrate to using openshift/api/cloudcredential API #224

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

Closed
joelddiaz wants to merge 3 commits into from
Closed

WIP: migrate to using openshift/api/cloudcredential API #224

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
ad8039a
vendor joelddiaz/openshift-api:cloud-cred-op-types
Jul 8, 2020
e0c9c8b
migrate to using openshift/api/cloudcredential API
Jul 8, 2020
e218533
remove CRD generation and now unused pkg/apis
Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ all: build
include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
golang.mk \
targets/openshift/bindata.mk \
targets/openshift/crd-schema-gen.mk \
targets/openshift/deps.mk \
)

Expand Down Expand Up @@ -68,24 +67,14 @@ $(call add-bindata,v4.1.0,./bindata/v4.1.0/...,bindata,v410_00_assets,pkg/assets
# $4 - context directory for image build
$(call build-image,ocp-cloud-credential-operator,$(IMAGE_REGISTRY)/ocp/4.5:cloud-credential-operator, ./Dockerfile,.)

# This will call a macro called "add-crd-gen" will will generate crd manifests based on the parameters:
# $1 - target name
# $2 - apis
# $3 - manifests
# $4 - output
$(call add-crd-gen,cloudcredential-manifests,./pkg/apis/cloudcredential/v1,./manifests,./manifests)
$(call add-crd-gen,cloudcredential-bindata,./pkg/apis/cloudcredential/v1,./bindata/bootstrap,./bindata/bootstrap)

update: update-codegen

update-codegen: update-codegen-crds
./hack/update-codegen.sh
update-codegen:
.PHONY: update-codegen

verify: verify-codegen

verify-codegen: verify-codegen-crds
./hack/verify-codegen.sh
verify-codegen:
.PHONY: verify-codegen

clean:
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ require (
k8s.io/code-generator v0.18.3
sigs.k8s.io/controller-runtime v0.6.0
)

replace github.com/openshift/api => github.com/joelddiaz/api v0.0.0-20200709114332-a68340a89e61
5 changes: 2 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
github.com/joelddiaz/api v0.0.0-20200709114332-a68340a89e61 h1:B693pYVuSdnyy8Q1toofJwkpa4QMuAmMeRxa4meFOyU=
github.com/joelddiaz/api v0.0.0-20200709114332-a68340a89e61/go.mod h1:l6TGeqJ92DrZBuWMNKcot1iZUHfbYSJyBWHGgg6Dn6s=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
Expand Down Expand Up @@ -368,9 +370,6 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/runc v0.0.0-20191031171055-b133feaeeb2e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/openshift/api v0.0.0-20200521101457-60c476765272/go.mod h1:TkhafijfTiRi1Q3120/ZSE4oIWKQ4DGRh3byPywv4Mw=
github.com/openshift/api v0.0.0-20200609191024-dca637550e8c h1:bKFV0gBWD+jg/xbR4jrf4jBFQE/c/jXj3bzDw8nZghU=
github.com/openshift/api v0.0.0-20200609191024-dca637550e8c/go.mod h1:l6TGeqJ92DrZBuWMNKcot1iZUHfbYSJyBWHGgg6Dn6s=
github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc h1:Bu1p7+ItPqhJhmMve7sVluKCYV+o+x1Ede0WY2/BI8Q=
github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
github.com/openshift/client-go v0.0.0-20200521150516-05eb9880269c h1:l7CmbzzkyWl4Y6qHmy6m4FvbH4iLnIXGrXqOfE5IFNA=
Expand Down
Empty file removed hack/boilerplate.go.txt
View file
Open in desktop
Empty file.
46 changes: 0 additions & 46 deletions hack/update-codegen.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions hack/verify-codegen.sh
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions pkg/apis/addtoscheme_cloudcreds_v1.go
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions pkg/apis/apis.go
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions pkg/apis/cloudcredential/group.go
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions pkg/apis/cloudcredential/v1/aws_manual.deepcopy_test.go
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions pkg/apis/cloudcredential/v1/doc.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/aws/actuator/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

log "github.com/sirupsen/logrus"

minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
ccaws "github.com/openshift/cloud-credential-operator/pkg/aws"
minteraws "github.com/openshift/cloud-credential-operator/pkg/aws"
"github.com/openshift/cloud-credential-operator/pkg/operator/constants"
Expand All @@ -33,6 +32,7 @@ import (
"github.com/openshift/cloud-credential-operator/pkg/operator/utils"
awsutils "github.com/openshift/cloud-credential-operator/pkg/operator/utils/aws"

minterv1 "github.com/openshift/api/cloudcredential/v1"
configv1 "github.com/openshift/api/config/v1"

"github.com/aws/aws-sdk-go/aws"
Expand Down
7 changes: 4 additions & 3 deletions pkg/aws/actuator/actuator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/openshift/cloud-credential-operator/pkg/apis"
minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
"github.com/openshift/api/cloudcredential"
minterv1 "github.com/openshift/api/cloudcredential/v1"

ccaws "github.com/openshift/cloud-credential-operator/pkg/aws"
mockaws "github.com/openshift/cloud-credential-operator/pkg/aws/mock"
"github.com/openshift/cloud-credential-operator/pkg/operator/constants"
Expand Down Expand Up @@ -63,7 +64,7 @@ func (a *awsClientBuilderRecorder) ClientBuilder(accessKeyID, secretAccessKey []
}

func TestCredentialsFetching(t *testing.T) {
apis.AddToScheme(scheme.Scheme)
cloudcredential.Install(scheme.Scheme)

codec, err := minterv1.NewCodec()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/aws/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

log "github.com/sirupsen/logrus"

minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
minterv1 "github.com/openshift/api/cloudcredential/v1"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
Expand Down
3 changes: 1 addition & 2 deletions pkg/azure/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"reflect"
"time"

minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"

corev1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -39,6 +37,7 @@ import (
log "github.com/sirupsen/logrus"
"sigs.k8s.io/controller-runtime/pkg/client"

minterv1 "github.com/openshift/api/cloudcredential/v1"
configv1 "github.com/openshift/api/config/v1"
)

Expand Down
4 changes: 3 additions & 1 deletion pkg/azure/actuator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ import (
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2015-11-01/resources"
"github.com/Azure/go-autorest/autorest/to"
"github.com/golang/mock/gomock"

minterv1 "github.com/openshift/api/cloudcredential/v1"
openshiftapiv1 "github.com/openshift/api/config/v1"
minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"

"github.com/openshift/cloud-credential-operator/pkg/azure"
azuremock "github.com/openshift/cloud-credential-operator/pkg/azure/mock"
"github.com/openshift/cloud-credential-operator/pkg/operator/constants"
Expand Down
3 changes: 2 additions & 1 deletion pkg/azure/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ package azure
import (
"context"

minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

minterv1 "github.com/openshift/api/cloudcredential/v1"
)

type base struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/azure/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import (
"context"
"fmt"

minterv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
minterv1 "github.com/openshift/api/cloudcredential/v1"

"github.com/openshift/cloud-credential-operator/pkg/operator/constants"
"github.com/openshift/cloud-credential-operator/pkg/operator/credentialsrequest/actuator"

Expand Down
Loading