Skip to content

Commit

Permalink
Generated docker files, manifest and bundle changes
Browse files Browse the repository at this point in the history
Signed-off-by: vbadrina <[email protected]>
  • Loading branch information
vbnrh committed Mar 20, 2024
1 parent 7d5ca14 commit 97b784c
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 48 deletions.
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=odf-multicluster-orchestrator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

Expand Down
41 changes: 24 additions & 17 deletions bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: mirrorpeers.multicluster.odf.openshift.io
spec:
Expand All @@ -20,14 +20,19 @@ spec:
description: MirrorPeer is the Schema for the mirrorpeers 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'
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'
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
Expand All @@ -40,8 +45,10 @@ spec:
description: PeerRef holds a reference to a mirror peer
properties:
clusterName:
description: ClusterName is the name of ManagedCluster. ManagedCluster
matching this name is considered a peer cluster.
description: |-
ClusterName is the name of ManagedCluster.
ManagedCluster matching this name is considered
a peer cluster.
type: string
storageClusterRef:
description: StorageClusterRef holds a reference to StorageCluster
Expand All @@ -67,16 +74,16 @@ spec:
type: boolean
overlappingCIDR:
default: false
description: OverlappingCIDR should be set to true if the peer clusters
have overlapping Pod or Service CIDR. This will enable storage clusters
to use submariner globalnet. Enabling this will cause storage service
disruption while network is being reconfigured.
description: |-
OverlappingCIDR should be set to true if the peer clusters
have overlapping Pod or Service CIDR. This will enable storage
clusters to use submariner globalnet. Enabling this will cause
storage service disruption while network is being reconfigured.
type: boolean
schedulingIntervals:
description: 'SchedulingIntervals is a list of intervals at which
mirroring snapshots are taken. DEPRECATED : Any changes to this
field will not affect the cluster state. Use DRPolicy.Spec.SchedulingInterval
instead.'
description: |-
SchedulingIntervals is a list of intervals at which mirroring snapshots are taken.
DEPRECATED : Any changes to this field will not affect the cluster state. Use DRPolicy.Spec.SchedulingInterval instead.
items:
type: string
type: array
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ metadata:
]
capabilities: Basic Install
console.openshift.io/plugins: '["odf-multicluster-console"]'
createdAt: "2023-07-20T12:52:54Z"
createdAt: "2024-03-20T12:51:52Z"
olm.skipRange: ""
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.30.0
operators.operatorframework.io/builder: operator-sdk-v1.34.1
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
labels:
operatorframework.io/arch.amd64: supported
Expand Down Expand Up @@ -275,6 +275,8 @@ spec:
- containerPort: 9443
name: webhook-server
protocol: TCP
- containerPort: 8081
protocol: TCP
readinessProbe:
httpGet:
path: /readyz
Expand Down Expand Up @@ -384,11 +386,6 @@ spec:
maturity: alpha
provider:
name: Red Hat
relatedImages:
- image: quay.io/ocs-dev/odf-multicluster-orchestrator:latest
name: odf-multicluster-operator
- image: quay.io/ocs-dev/odf-multicluster-console:latest
name: odf-multicluster-console
version: 0.0.1
webhookdefinitions:
- admissionReviewVersions:
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ annotations:
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: odf-multicluster-orchestrator
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.30.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Expand Down
42 changes: 24 additions & 18 deletions config/crd/bases/multicluster.odf.openshift.io_mirrorpeers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: mirrorpeers.multicluster.odf.openshift.io
spec:
group: multicluster.odf.openshift.io
Expand All @@ -21,14 +20,19 @@ spec:
description: MirrorPeer is the Schema for the mirrorpeers 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'
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'
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
Expand All @@ -41,8 +45,10 @@ spec:
description: PeerRef holds a reference to a mirror peer
properties:
clusterName:
description: ClusterName is the name of ManagedCluster. ManagedCluster
matching this name is considered a peer cluster.
description: |-
ClusterName is the name of ManagedCluster.
ManagedCluster matching this name is considered
a peer cluster.
type: string
storageClusterRef:
description: StorageClusterRef holds a reference to StorageCluster
Expand All @@ -68,16 +74,16 @@ spec:
type: boolean
overlappingCIDR:
default: false
description: OverlappingCIDR should be set to true if the peer clusters
have overlapping Pod or Service CIDR. This will enable storage clusters
to use submariner globalnet. Enabling this will cause storage service
disruption while network is being reconfigured.
description: |-
OverlappingCIDR should be set to true if the peer clusters
have overlapping Pod or Service CIDR. This will enable storage
clusters to use submariner globalnet. Enabling this will cause
storage service disruption while network is being reconfigured.
type: boolean
schedulingIntervals:
description: 'SchedulingIntervals is a list of intervals at which
mirroring snapshots are taken. DEPRECATED : Any changes to this
field will not affect the cluster state. Use DRPolicy.Spec.SchedulingInterval
instead.'
description: |-
SchedulingIntervals is a list of intervals at which mirroring snapshots are taken.
DEPRECATED : Any changes to this field will not affect the cluster state. Use DRPolicy.Spec.SchedulingInterval instead.
items:
type: string
type: array
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: manager-role
rules:
- apiGroups:
Expand Down
2 changes: 0 additions & 2 deletions config/webhook/manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
creationTimestamp: null
name: mutating-webhook-configuration
webhooks:
- admissionReviewVersions:
Expand Down Expand Up @@ -30,7 +29,6 @@ webhooks:
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
creationTimestamp: null
name: validating-webhook-configuration
webhooks:
- admissionReviewVersions:
Expand Down

0 comments on commit 97b784c

Please sign in to comment.