Skip to content

Commit

Permalink
Merge pull request #102 from ciaranRoche/namespace-fix
Browse files Browse the repository at this point in the history
fix namespace prefix error
  • Loading branch information
openshift-merge-robot authored Jan 31, 2020
2 parents 15ea52e + fe95019 commit 75afcff
Show file tree
Hide file tree
Showing 16 changed files with 789 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IMAGE_NAME=cloud-resource-operator
MANIFEST_NAME=cloud-resources
NAMESPACE=cloud-resource-operator
PREV_VERSION=0.7.1
VERSION=0.7.2
VERSION=0.8.0
COMPILE_TARGET=./tmp/_output/bin/$(IMAGE_NAME)
OPERATOR_SDK_VERSION=0.12.0

Expand Down

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: blobstorages.integreatly.org
spec:
group: integreatly.org
names:
kind: BlobStorage
listKind: BlobStorageList
plural: blobstorages
singular: blobstorage
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
skipCreate:
type: boolean
tier:
type: string
type:
type: string
required:
- type
- tier
- secretRef
type: object
status:
properties:
message:
type: string
phase:
type: string
provider:
type: string
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
strategy:
type: string
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: postgres.integreatly.org
spec:
group: integreatly.org
names:
kind: Postgres
listKind: PostgresList
plural: postgres
singular: postgres
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
skipCreate:
type: boolean
tier:
type: string
type:
type: string
required:
- type
- tier
- secretRef
type: object
status:
properties:
message:
type: string
phase:
type: string
provider:
type: string
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
strategy:
type: string
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: postgressnapshots.integreatly.org
spec:
group: integreatly.org
names:
kind: PostgresSnapshot
listKind: PostgresSnapshotList
plural: postgressnapshots
singular: postgressnapshot
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
resourceName:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "operator-sdk generate k8s" to regenerate code after
modifying this file Add custom validation using kubebuilder tags:
https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
type: string
required:
- resourceName
type: object
status:
properties:
message:
type: string
phase:
type: string
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: redis.integreatly.org
spec:
group: integreatly.org
names:
kind: Redis
listKind: RedisList
plural: redis
singular: redis
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
skipCreate:
type: boolean
tier:
type: string
type:
type: string
required:
- type
- tier
- secretRef
type: object
status:
properties:
message:
type: string
phase:
type: string
provider:
type: string
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
strategy:
type: string
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: redissnapshots.integreatly.org
spec:
group: integreatly.org
names:
kind: RedisSnapshot
listKind: RedisSnapshotList
plural: redissnapshots
singular: redissnapshot
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
resourceName:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "operator-sdk generate k8s" to regenerate code after
modifying this file Add custom validation using kubebuilder tags:
https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
type: string
required:
- resourceName
type: object
status:
properties:
message:
type: string
phase:
type: string
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
Loading

0 comments on commit 75afcff

Please sign in to comment.