From 97b784c4c196d6a30ea6af185ef79d7bcc9aa413 Mon Sep 17 00:00:00 2001 From: vbadrina Date: Wed, 20 Mar 2024 18:32:13 +0530 Subject: [PATCH] Generated docker files, manifest and bundle changes Signed-off-by: vbadrina --- api/v1alpha1/zz_generated.deepcopy.go | 1 - bundle.Dockerfile | 2 +- ...icluster.odf.openshift.io_mirrorpeers.yaml | 41 ++++++++++-------- ...er-orchestrator.clusterserviceversion.yaml | 11 ++--- bundle/metadata/annotations.yaml | 2 +- ...icluster.odf.openshift.io_mirrorpeers.yaml | 42 +++++++++++-------- config/rbac/role.yaml | 1 - config/webhook/manifests.yaml | 2 - 8 files changed, 54 insertions(+), 48 deletions(-) diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 5cb85f85..9bcfe525 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021 Red Hat OpenShift Data Foundation. diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 2623fc75..34753d31 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -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 diff --git a/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml b/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml index 8cfc8520..54e3acb0 100644 --- a/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml +++ b/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml @@ -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: @@ -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 @@ -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 @@ -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 diff --git a/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml b/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml index 8701f82e..fafb6d34 100644 --- a/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml +++ b/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml @@ -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 @@ -275,6 +275,8 @@ spec: - containerPort: 9443 name: webhook-server protocol: TCP + - containerPort: 8081 + protocol: TCP readinessProbe: httpGet: path: /readyz @@ -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: diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index f883f7a3..3e3413fb 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -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 diff --git a/config/crd/bases/multicluster.odf.openshift.io_mirrorpeers.yaml b/config/crd/bases/multicluster.odf.openshift.io_mirrorpeers.yaml index bcc4325f..9bf49327 100644 --- a/config/crd/bases/multicluster.odf.openshift.io_mirrorpeers.yaml +++ b/config/crd/bases/multicluster.odf.openshift.io_mirrorpeers.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index f7e171f0..12794311 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 588cb0ea..fa811cf9 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - creationTimestamp: null name: mutating-webhook-configuration webhooks: - admissionReviewVersions: @@ -30,7 +29,6 @@ webhooks: apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: