Skip to content
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

Fix OLM data & formatting issues #200

Merged
merged 16 commits into from
Sep 18, 2020
Merged

Fix OLM data & formatting issues #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2a54560
Properly select and set the latest version in CRDs
JohnStarich Sep 16, 2020
2cd43e4
Add openshift-courier installer and validator (not wired in yet)
JohnStarich Aug 25, 2020
499fbfc
Add versions to CSV's customresourcedefinitions section
JohnStarich Sep 16, 2020
d93d3b9
Fix shape of deployments
JohnStarich Sep 16, 2020
203fd4e
Add "make operator-push-test"
JohnStarich Sep 17, 2020
c001e66
Reorder CRD versions, top-level version must match first one in the list
JohnStarich Sep 17, 2020
502b492
Split cluster roles and regular roles
JohnStarich Sep 17, 2020
af8bd9d
Ensure all rbac types handled in OLM
JohnStarich Sep 17, 2020
2385c3f
Include service account name from role bindings
JohnStarich Sep 17, 2020
19e3d42
Also push image on operator test push
JohnStarich Sep 17, 2020
a438c96
Only process secrets with the ibmcloud-operator app label
JohnStarich Sep 18, 2020
fc371b9
Raise memory limit for OpenShift: https://github.com/IBM/cloud-operat…
JohnStarich Sep 18, 2020
22733c7
Fix management namespace secret watches
JohnStarich Sep 18, 2020
76463f7
Fix tests
JohnStarich Sep 18, 2020
6da9d6d
Fix tests
JohnStarich Sep 18, 2020
f4dce36
Fix coverage drop in token controller
JohnStarich Sep 18, 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
32 changes: 31 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,40 @@ out:

# Prepares Kubernetes yaml files for release. Useful for testing against your own cluster.
.PHONY: release-prep
release-prep: kustomize out
release-prep: kustomize manifests out
cd config/manager && kustomize edit set image controller=${IMG}
kustomize build config/default --output out/
go run ./internal/cmd/genolm --version ${RELEASE_VERSION}

.PHONY: release
release: release-prep docker-push

.PHONY: operator-courier
operator-courier:
@if ! which operator-courier; then \
pip3 install operator-courier; \
fi

.PHONY: verify-operator-meta
verify-operator-meta: release-prep operator-courier
operator-courier verify --ui_validate_io out/

.PHONY: operator-push-test
operator-push-test: IMG = quay.io/${QUAY_NAMESPACE}/${QUAY_REPO}:${RELEASE_VERSION}
operator-push-test: verify-operator-meta docker-build
# Example values:
#
# QUAY_NAMESPACE=myuser
# QUAY_REPO=ibmcloud-operator-image
# QUAY_APP=ibmcloud-operator NOTE: Must have a repository AND a quay "application". They aren't the same thing.
# QUAY_USER=myuser+mybot NOTE: Bot users are best, so you can manage permissions better.
# QUAY_TOKEN=abcdef1234567
@for v in "${QUAY_NAMESPACE}" "${QUAY_APP}" "${QUAY_REPO}" "${RELEASE_VERSION}" "${QUAY_USER}" "${QUAY_TOKEN}"; do \
if [[ -z "$$v" ]]; then \
echo 'Not all Quay variables set. See the make target for details.'; \
exit 1; \
fi; \
done
docker login -u="${QUAY_USER}" -p="${QUAY_TOKEN}" quay.io
docker push "${IMG}"
operator-courier push ./out "${QUAY_NAMESPACE}" "${QUAY_APP}" "${RELEASE_VERSION}" "Basic $$(printf "${QUAY_USER}:${QUAY_TOKEN}" | base64)"
44 changes: 22 additions & 22 deletions config/crd/bases/ibmcloud.ibm.com_bindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ spec:
scope: Namespaced
subresources:
status: {}
version: v1alpha1
version: v1beta1
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: Binding is the Schema for the bindings API
description: Binding is an instance of a service binding resource on IBM Cloud.
A Binding creates a secret with the service instance credentials.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -45,8 +46,10 @@ spec:
description: BindingSpec defines the desired state of Binding
properties:
alias:
description: Alias is the name for the credentials to be aliased
type: string
parameters:
description: Parameters pass configuration to the service during creation
items:
description: Param represents a key-value pair
properties:
Expand Down Expand Up @@ -106,12 +109,18 @@ spec:
type: object
type: array
role:
description: Role is the role for the credentials
type: string
secretName:
description: SecretName is the name of the secret where credentials
will be stored
type: string
serviceName:
description: ServiceClass is the name of the service resource to bind
type: string
serviceNamespace:
description: ServiceNamespace is the namespace of the service resource
to bind
type: string
required:
- serviceName
Expand All @@ -123,24 +132,29 @@ spec:
format: int64
type: integer
instanceId:
description: InstanceID is the instance ID for the service
type: string
keyInstanceId:
description: KeyInstanceID is the key instance ID for the credentials
type: string
message:
description: Message is a detailed message on current status
type: string
secretName:
description: SecretName is the name of the generated secret with service
credentials
type: string
state:
description: State is a short name for the current status
type: string
type: object
type: object
served: true
storage: false
- name: v1beta1
storage: true
- name: v1alpha1
schema:
openAPIV3Schema:
description: Binding is an instance of a service binding resource on IBM Cloud.
A Binding creates a secret with the service instance credentials.
description: Binding is the Schema for the bindings API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -158,10 +172,8 @@ spec:
description: BindingSpec defines the desired state of Binding
properties:
alias:
description: Alias is the name for the credentials to be aliased
type: string
parameters:
description: Parameters pass configuration to the service during creation
items:
description: Param represents a key-value pair
properties:
Expand Down Expand Up @@ -221,18 +233,12 @@ spec:
type: object
type: array
role:
description: Role is the role for the credentials
type: string
secretName:
description: SecretName is the name of the secret where credentials
will be stored
type: string
serviceName:
description: ServiceClass is the name of the service resource to bind
type: string
serviceNamespace:
description: ServiceNamespace is the namespace of the service resource
to bind
type: string
required:
- serviceName
Expand All @@ -244,25 +250,19 @@ spec:
format: int64
type: integer
instanceId:
description: InstanceID is the instance ID for the service
type: string
keyInstanceId:
description: KeyInstanceID is the key instance ID for the credentials
type: string
message:
description: Message is a detailed message on current status
type: string
secretName:
description: SecretName is the name of the generated secret with service
credentials
type: string
state:
description: State is a short name for the current status
type: string
type: object
type: object
served: true
storage: true
storage: false
status:
acceptedNames:
kind: ""
Expand Down
58 changes: 29 additions & 29 deletions config/crd/bases/ibmcloud.ibm.com_services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ spec:
scope: Namespaced
subresources:
status: {}
version: v1alpha1
version: v1beta1
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: Service is the Schema for the services API
description: Service is an instance of a Service resource on IBM Cloud.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -52,8 +52,6 @@ spec:
type: string
region:
type: string
resourcegroup:
type: string
resourcegroupid:
type: string
resourcelocation:
Expand All @@ -64,8 +62,11 @@ spec:
type: string
type: object
externalName:
description: ExternalName is the name for the service as it appears
on IBM Cloud
type: string
parameters:
description: Parameters pass configuration to the service during creation
items:
description: Param represents a key-value pair
properties:
Expand Down Expand Up @@ -125,10 +126,14 @@ spec:
type: object
type: array
plan:
description: Plan for the service from the IBM Cloud Catalog
type: string
serviceClass:
description: ServiceClass is the name of the service from the IBM
Cloud Catalog
type: string
serviceClassType:
description: ServiceClassType is set to CF if the service is CloundFoundry
type: string
tags:
items:
Expand All @@ -149,8 +154,6 @@ spec:
type: string
region:
type: string
resourcegroup:
type: string
resourcegroupid:
type: string
resourcelocation:
Expand All @@ -161,17 +164,23 @@ spec:
type: string
type: object
dashboardURL:
description: DashboardURL is the dashboard URL for the service
type: string
externalName:
description: ExternalName is the name for the service as it appears
on IBM Cloud
type: string
generation:
format: int64
type: integer
instanceId:
description: InstanceID is the instance ID for the service
type: string
message:
description: Message is a detailed message on current status
type: string
parameters:
description: Parameters pass configuration to the service during creation
items:
description: Param represents a key-value pair
properties:
Expand Down Expand Up @@ -231,12 +240,17 @@ spec:
type: object
type: array
plan:
description: Plan for the service from the IBM Cloud Catalog
type: string
serviceClass:
description: ServiceClass is the name of the service from the IBM
Cloud Catalog
type: string
serviceClassType:
description: ServiceClassType is set to CF if the service is CloundFoundry
type: string
state:
description: State is a short name for the current status
type: string
tags:
items:
Expand All @@ -249,11 +263,11 @@ spec:
type: object
type: object
served: true
storage: false
- name: v1beta1
storage: true
- name: v1alpha1
schema:
openAPIV3Schema:
description: Service is an instance of a Service resource on IBM Cloud.
description: Service is the Schema for the services API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -278,6 +292,8 @@ spec:
type: string
region:
type: string
resourcegroup:
type: string
resourcegroupid:
type: string
resourcelocation:
Expand All @@ -288,11 +304,8 @@ spec:
type: string
type: object
externalName:
description: ExternalName is the name for the service as it appears
on IBM Cloud
type: string
parameters:
description: Parameters pass configuration to the service during creation
items:
description: Param represents a key-value pair
properties:
Expand Down Expand Up @@ -352,14 +365,10 @@ spec:
type: object
type: array
plan:
description: Plan for the service from the IBM Cloud Catalog
type: string
serviceClass:
description: ServiceClass is the name of the service from the IBM
Cloud Catalog
type: string
serviceClassType:
description: ServiceClassType is set to CF if the service is CloundFoundry
type: string
tags:
items:
Expand All @@ -380,6 +389,8 @@ spec:
type: string
region:
type: string
resourcegroup:
type: string
resourcegroupid:
type: string
resourcelocation:
Expand All @@ -390,23 +401,17 @@ spec:
type: string
type: object
dashboardURL:
description: DashboardURL is the dashboard URL for the service
type: string
externalName:
description: ExternalName is the name for the service as it appears
on IBM Cloud
type: string
generation:
format: int64
type: integer
instanceId:
description: InstanceID is the instance ID for the service
type: string
message:
description: Message is a detailed message on current status
type: string
parameters:
description: Parameters pass configuration to the service during creation
items:
description: Param represents a key-value pair
properties:
Expand Down Expand Up @@ -466,17 +471,12 @@ spec:
type: object
type: array
plan:
description: Plan for the service from the IBM Cloud Catalog
type: string
serviceClass:
description: ServiceClass is the name of the service from the IBM
Cloud Catalog
type: string
serviceClassType:
description: ServiceClassType is set to CF if the service is CloundFoundry
type: string
state:
description: State is a short name for the current status
type: string
tags:
items:
Expand All @@ -489,7 +489,7 @@ spec:
type: object
type: object
served: true
storage: true
storage: false
status:
acceptedNames:
kind: ""
Expand Down
Loading