Skip to content

Commit

Permalink
Merge pull request #3155 from integr8ly/prepare-for-release-rhoam-v1.…
Browse files Browse the repository at this point in the history
…33.0-MT

merge for release 1.33.0
  • Loading branch information
fh-automatron authored Mar 15, 2023
2 parents 2150093 + 453c008 commit bfe8358
Show file tree
Hide file tree
Showing 10 changed files with 1,261 additions and 4 deletions.
21 changes: 21 additions & 0 deletions bundles/multitenant-managed-api-service/1.33.0/bundle.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM scratch

# Core bundle labels.
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=managed-api-service
LABEL operators.operatorframework.io.bundle.channels.v1=stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.7.1+git
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2

# Labels for testing.
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/

# Copy files to locations specified by labels.
COPY bundles/multitenant-managed-api-service/1.33.0/manifests /manifests/
COPY bundles/multitenant-managed-api-service/1.33.0/metadata /metadata/
COPY bundles/multitenant-managed-api-service/1.33.0/tests/scorecard /tests/scorecard/
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: apimanagementtenants.integreatly.org
spec:
group: integreatly.org
names:
kind: APIManagementTenant
listKind: APIManagementTenantList
plural: apimanagementtenants
singular: apimanagementtenant
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: APIManagementTenant is the Schema for the APIManagementTenants API
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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: APIManagementTenantSpec defines the desired state of APIManagementTenant
type: object
status:
description: APIManagementTenantStatus defines the observed state of APIManagementTenant
properties:
lastError:
type: string
provisioningStatus:
type: string
tenantUrl:
type: string
required:
- lastError
- provisioningStatus
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: rhmis.integreatly.org
spec:
group: integreatly.org
names:
kind: RHMI
listKind: RHMIList
plural: rhmis
singular: rhmi
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: RHMI is the Schema for the rhmis API
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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: RHMISpec defines the desired state of RHMI
properties:
APIServer:
type: string
alertFromAddress:
type: string
alertingEmailAddress:
type: string
alertingEmailAddresses:
properties:
businessUnit:
type: string
cssre:
type: string
required:
- businessUnit
- cssre
type: object
deadMansSnitchSecret:
description: "DeadMansSnitchSecret is the name of a secret in the installation namespace containing connection details for Dead Mans Snitch. The secret must contain the following fields: \n url"
type: string
masterURL:
type: string
namespacePrefix:
type: string
operatorsInProductNamespace:
description: OperatorsInProductNamespace is a flag that decides if the product operators should be installed in the product namespace (when set to true) or in standalone namespace (when set to false, default). Standalone namespace will be used only for those operators that support it.
type: boolean
pagerDutySecret:
description: "PagerDutySecret is the name of a secret in the installation namespace containing PagerDuty account details. The secret must contain the following fields: \n serviceKey"
type: string
priorityClassName:
type: string
pullSecret:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
rebalancePods:
type: boolean
routingSubdomain:
type: string
selfSignedCerts:
type: boolean
smtpSecret:
description: "SMTPSecret is the name of a secret in the installation namespace containing SMTP connection details. The secret must contain the following fields: \n host port tls username password"
type: string
type:
type: string
useClusterStorage:
type: string
required:
- namespacePrefix
- type
type: object
status:
description: RHMIStatus defines the observed state of RHMI
properties:
customDomain:
properties:
enabled:
type: boolean
error:
type: string
required:
- enabled
type: object
customSmtp:
properties:
enabled:
type: boolean
error:
type: string
required:
- enabled
type: object
gitHubOAuthEnabled:
type: boolean
lastError:
type: string
preflightMessage:
type: string
preflightStatus:
type: string
quota:
type: string
smtpEnabled:
type: boolean
stage:
type: string
stages:
additionalProperties:
properties:
name:
type: string
phase:
type: string
products:
additionalProperties:
properties:
host:
type: string
mobile:
type: boolean
name:
type: string
operator:
type: string
status:
type: string
type:
type: string
uninstall:
type: boolean
version:
type: string
required:
- host
- name
- status
- version
type: object
type: object
required:
- name
- phase
type: object
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state of cluster Important: Run "make" to regenerate code after modifying this file'
type: object
toQuota:
type: string
toVersion:
type: string
version:
type: string
required:
- lastError
- stage
- stages
type: object
type: object
served: true
storage: true
subresources:
status: {}
validation:
openAPIV3Schema:
description: RHOAM is the Schema for the RHOAM API
properties:
spec:
description: RHOAMSpec defines the desired state of Installation
status:
description: RHOAMStatus defines the observed state of Installation
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit bfe8358

Please sign in to comment.