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.

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 name/url/email etc fields in operator bundle #841

Merged
merged 1 commit into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion helm/bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM scratch
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=directpv-operator
LABEL operators.operatorframework.io.bundle.package.v1=minio-directpv-operator-rhmp
cniackz marked this conversation as resolved.
Show resolved Hide resolved
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
Expand Down
10 changes: 5 additions & 5 deletions helm/bundle/manifests/charts.quay.io_directpvcharts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ metadata:
spec:
group: charts.quay.io
names:
kind: DirectpvChart
listKind: DirectpvChartList
kind: DirectPVChart
listKind: DirectPVChartList
plural: directpvcharts
singular: directpvchart
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: DirectpvChart is the Schema for the directpvcharts API
description: DirectPVChart is the Schema for the directpvcharts API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -30,11 +30,11 @@ spec:
metadata:
type: object
spec:
description: Spec defines the desired state of DirectpvChart
description: Spec defines the desired state of DirectPVChart
type: object
x-kubernetes-preserve-unknown-fields: true
status:
description: Status defines the observed state of DirectpvChart
description: Status defines the observed state of DirectPVChart
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
[
{
"apiVersion": "charts.quay.io/v1alpha1",
"kind": "DirectpvChart",
"kind": "DirectPVChart",
"metadata": {
"name": "directpvchart-sample"
},
Expand Down Expand Up @@ -66,17 +66,17 @@ metadata:
createdAt: "2023-08-17T13:36:51Z"
operators.operatorframework.io/builder: operator-sdk-v1.31.0
operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
name: directpv-operator.v4.0.7
name: minio-directpv-operator-rhmp.v4.0.7
namespace: placeholder
spec:
apiservicedefinitions: {}
customresourcedefinitions:
owned:
- kind: DirectpvChart
- kind: DirectPVChart
name: directpvcharts.charts.quay.io
version: v1alpha1
description: directpv
displayName: directpv
description: Minio DirectPV Operator manages DirectPV deployments.
displayName: Minio DirectPV Operator
icon:
- base64data: ""
mediatype: ""
Expand Down Expand Up @@ -243,7 +243,7 @@ spec:
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
- --leader-election-id=directpv-operator
image: quay.io/cniackz4/directpv-operator:4.0.7
image: quay.io/minio/directpv-operator:4.0.7
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -318,14 +318,15 @@ spec:
- supported: true
type: AllNamespaces
keywords:
- directpv
- minio-directpv-operator-rhmp
links:
- name: Directpv Operator
url: https://directpv-operator.domain
- name: Minio DirectPV Operator
url: https://min.io/directpv
maintainers:
- email: cesar@minio.io
name: cesar
- email: dev@minio.io
name: MinIO, Inc.
maturity: alpha
provider:
name: directpv
name: DirectPV
url: https://min.io/directpv
cniackz marked this conversation as resolved.
Show resolved Hide resolved
version: 4.0.7
10 changes: 5 additions & 5 deletions helm/config/crd/bases/charts.quay.io_directpvcharts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ metadata:
spec:
group: charts.quay.io
names:
kind: DirectpvChart
listKind: DirectpvChartList
kind: DirectPVChart
listKind: DirectPVChartList
plural: directpvcharts
singular: directpvchart
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: DirectpvChart is the Schema for the directpvcharts API
description: DirectPVChart is the Schema for the directpvcharts API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -30,11 +30,11 @@ spec:
metadata:
type: object
spec:
description: Spec defines the desired state of DirectpvChart
description: Spec defines the desired state of DirectPVChart
type: object
x-kubernetes-preserve-unknown-fields: true
status:
description: Status defines the observed state of DirectpvChart
description: Status defines the observed state of DirectPVChart
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
annotations:
alm-examples: '[{"apiVersion": "charts.quay.io/v1alpha1","kind": "DirectPVChart","metadata":
{"name": "directpvchart-sample"},"spec":{"affinity": {},"autoscaling": {"enabled":
false,"maxReplicas": 100,"minReplicas": 1,"targetCPUUtilizationPercentage":
80},"fullnameOverride": "","image": {"pullPolicy": "IfNotPresent","repository":
"nginx","tag": ""},"imagePullSecrets": [],"ingress": {"annotations": {},"className":
"","enabled": false,"hosts": [{"host": "chart-example.local","paths": [{"path":
"/","pathType": "ImplementationSpecific"}]}],"tls": []},"nameOverride": "","nodeSelector":
{},"podAnnotations": {},"podSecurityContext": {},"replicaCount": 1,"resources":
{},"securityContext": {},"service": {"port": 80,"type": "ClusterIP"},"serviceAccount":
{"annotations": {},"create": true,"name": ""},"tolerations": []}}]'
capabilities: Basic Install
name: minio-directpv-operator-rhmp.v0.0.0
namespace: placeholder
spec:
apiservicedefinitions: {}
customresourcedefinitions: {}
description: Minio DirectPV Operator manages DirectPV deployments.
displayName: DirectPV
icon:
- base64data: ""
mediatype: ""
install:
spec:
deployments: null
strategy: ""
installModes:
- supported: false
type: OwnNamespace
- supported: false
type: SingleNamespace
- supported: false
type: MultiNamespace
- supported: true
type: AllNamespaces
keywords:
- DirectPV
links:
- name: Minio DirectPV Operator
url: https://min.io/directpv
maintainers:
- email: dev@minio.io
name: DirectPV
maturity: alpha
provider:
name: DirectPV
url: https://min.io/directpv
version: 0.0.0
2 changes: 1 addition & 1 deletion helm/config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# These resources constitute the fully configured set of manifests
# used to generate the 'manifests/' directory in a bundle.
resources:
- bases/directpv-operator.clusterserviceversion.yaml
- bases/minio-directpv-operator-rhmp.clusterserviceversion.yaml
- ../default
- ../samples
- ../scorecard
2 changes: 1 addition & 1 deletion helm/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function main() {
# docker push "${IMG}"

# bundle: Generate bundle manifests and metadata, then validate generated files.
operator-sdk generate kustomize manifests -q
operator-sdk generate kustomize manifests -q --package minio-directpv-operator-rhmp
(cd config/manager && kustomize edit set image controller="$IMG")
kustomize build config/manifests | operator-sdk generate bundle "$BUNDLE_GEN_FLAGS"
operator-sdk bundle validate ./bundle
Expand Down
Loading