This repository was archived by the owner on Mar 3, 2025. It is now read-only.
(cleanup): Reconfigure the manifests & manifest generation #16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,42 @@ | ||
| apiVersion: apiregistration.k8s.io/v1 | ||
| kind: APIService | ||
| metadata: | ||
| name: v1beta1.catalogd.operatorframework.io | ||
| labels: | ||
| api: catalogd | ||
| apiserver: "true" | ||
| app.kubernetes.io/name: apiservice | ||
| app.kubernetes.io/instance: system | ||
| app.kubernetes.io/component: apiservice | ||
| app.kubernetes.io/created-by: catalogd | ||
| app.kubernetes.io/part-of: catalogd | ||
| app.kubernetes.io/managed-by: kustomize | ||
| annotations: | ||
| # Have cert manager inject the caBundle field using the cert we created | ||
| cert-manager.io/inject-ca-from: catalogd-system/server-cert | ||
| spec: | ||
| version: v1beta1 | ||
| group: catalogd.operatorframework.io | ||
| groupPriorityMinimum: 2000 | ||
| service: | ||
| name: catalogd | ||
| namespace: system | ||
| versionPriority: 10 | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: apiserver | ||
| namespace: system | ||
| labels: | ||
| api: catalogd | ||
| apiserver: "true" | ||
| app.kubernetes.io/name: deployment | ||
| app.kubernetes.io/instance: system | ||
| app.kubernetes.io/component: apiservice | ||
| app.kubernetes.io/created-by: catalogd | ||
| app.kubernetes.io/part-of: catalogd | ||
| app.kubernetes.io/managed-by: kustomize | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
|
|
@@ -19,18 +49,19 @@ spec: | |
| api: catalogd | ||
| apiserver: "true" | ||
| spec: | ||
| serviceAccountName: apiserver | ||
| containers: | ||
| - name: apiserver | ||
|
Member
There was a problem hiding this comment. For follow-up: we should setup the security context to make sure this can run under
Member
There was a problem hiding this comment. Yea I just remembered, there's already some pending work to make this compatible with |
||
| image: apiserver:latest | ||
| imagePullPolicy: IfNotPresent | ||
| volumeMounts: | ||
| - name: catalogd-apiserver-certs | ||
| mountPath: /apiserver.local.config/certificates | ||
| readOnly: true | ||
| command: | ||
| - "./apiserver" | ||
| args: | ||
| - "--etcd-servers=http://catalogd-etcd-svc:2379" | ||
| - "--tls-cert-file=/apiserver.local.config/certificates/tls.crt" | ||
| - "--tls-private-key-file=/apiserver.local.config/certificates/tls.key" | ||
| - "--audit-log-path=-" | ||
|
|
@@ -46,15 +77,15 @@ spec: | |
| cpu: 100m | ||
| memory: 30Mi | ||
| volumes: | ||
| - name: catalogd-apiserver-certs | ||
| secret: | ||
| secretName: catalogd-apiserver | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: apiserver | ||
| namespace: system | ||
| labels: | ||
| api: catalogd | ||
| apiserver: "true" | ||
|
|
@@ -74,7 +105,7 @@ metadata: | |
| api: catalogd | ||
| apiserver: "true" | ||
| name: selfsigned-issuer | ||
| namespace: system | ||
| spec: | ||
| selfSigned: {} | ||
| --- | ||
|
|
@@ -84,14 +115,14 @@ metadata: | |
| labels: | ||
| api: catalogd | ||
| apiserver: "true" | ||
| name: server-cert | ||
| namespace: system | ||
| spec: | ||
| dnsNames: | ||
| - catalogd-apiserver.catalogd.svc | ||
| - catalogd-apiserver.catalogd.svc.cluster.local | ||
| - localhost | ||
| issuerRef: | ||
| kind: Issuer | ||
| name: catalogd-selfsigned-issuer | ||
| secretName: catalogd-apiserver | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,8 @@ | ||||||
| resources: | ||||||
| - apiserver.yaml | ||||||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||||||
| kind: Kustomization | ||||||
| images: | ||||||
| - name: apiserver | ||||||
| newName: quay.io/operator-framework/catalogd-server | ||||||
| newTag: latest | ||||||
|
Member
There was a problem hiding this comment. Based on discussion in the other PR?
Suggested change
Collaborator
Author
There was a problem hiding this comment. I was going to wait and make the necessary changes based on whichever PR gets in first |
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
|
Member
There was a problem hiding this comment. Wait, I'm confused. If the
Collaborator
Author
There was a problem hiding this comment. My understanding is we are offloading the storage of those resources to the custom apiservice to handle and it was storing them in the separate etcd instance. That being said, I have extremely limited knowledge on custom apiservices and have no idea if this one is working as expected. cc @anik120
Member
There was a problem hiding this comment. If that were true, there would be no CRDs for |
||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.9.0 | ||
| creationTimestamp: null | ||
| name: bundlemetadata.catalogd.operatorframework.io | ||
| spec: | ||
| group: catalogd.operatorframework.io | ||
| names: | ||
| kind: BundleMetadata | ||
| listKind: BundleMetadataList | ||
| plural: bundlemetadata | ||
| singular: bundlemetadata | ||
| scope: Cluster | ||
| versions: | ||
| - name: v1beta1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: BundleMetadata | ||
| 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: BundleMetadataSpec defines the desired state of BundleMetadata | ||
| properties: | ||
| catalogSource: | ||
| description: CatalogSource is the name of the CatalogSource that provides | ||
| this bundle | ||
| type: string | ||
| image: | ||
| description: Image is a reference to the image that provides the bundle | ||
| contents | ||
| type: string | ||
| package: | ||
| description: Package is the name of the package that provides this | ||
| bundle | ||
| type: string | ||
| properties: | ||
| description: Properties is a string of references to property objects | ||
| that are part of the bundle | ||
| items: | ||
| description: 'TODO: In the future we should remove this in favor | ||
| of using `property.Property` from https://pkg.go.dev/github.com/operator-framework/operator-registry@v1.26.3/alpha/property#Property | ||
| This will likely require some changes to the `property.Property` | ||
| type to make it suitable for usage within the Spec for a CustomResource' | ||
| properties: | ||
| type: | ||
| type: string | ||
| value: | ||
| format: byte | ||
| type: string | ||
| required: | ||
| - type | ||
| - value | ||
| type: object | ||
| type: array | ||
| relatedImages: | ||
| description: RelatedImages are the RelatedImages in the bundle | ||
| items: | ||
| description: 'TODO: In the future we should remove this in favor | ||
| of using `model.RelatedImage` (or similar) from https://pkg.go.dev/github.com/operator-framework/operator-registry@v1.26.3/alpha/model#RelatedImage | ||
| This will likely require some changes to the `model.RelatedImage` | ||
| type to make it suitable for usage within the Spec for a CustomResource' | ||
| properties: | ||
| image: | ||
| type: string | ||
| name: | ||
| type: string | ||
| required: | ||
| - image | ||
| - name | ||
| type: object | ||
| type: array | ||
| required: | ||
| - catalogSource | ||
| - image | ||
| - package | ||
| - properties | ||
| - relatedImages | ||
| type: object | ||
| status: | ||
| description: BundleMetadataStatus defines the observed state of BundleMetadata | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.9.0 | ||
| creationTimestamp: null | ||
| name: catalogsources.catalogd.operatorframework.io | ||
| spec: | ||
| group: catalogd.operatorframework.io | ||
| names: | ||
| kind: CatalogSource | ||
| listKind: CatalogSourceList | ||
| plural: catalogsources | ||
| singular: catalogsource | ||
| scope: Cluster | ||
| versions: | ||
| - name: v1beta1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: CatalogSource | ||
| 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: CatalogSourceSpec defines the desired state of CatalogSource | ||
| properties: | ||
| image: | ||
| description: Image is the Catalog image that contains Operators' metadata | ||
| in the FBC format https://olm.operatorframework.io/docs/reference/file-based-catalogs/#docs | ||
| type: string | ||
| pollingInterval: | ||
| description: PollingInterval is used to determine the time interval | ||
| between checks of the latest index image version. The image is polled | ||
| to see if a new version of the image is available. If available, | ||
| the latest image is pulled and the cache is updated to contain the | ||
| new content. | ||
| type: string | ||
| required: | ||
| - image | ||
| type: object | ||
| status: | ||
| description: CatalogSourceStatus defines the observed state of CatalogSource | ||
| properties: | ||
| latestImagePoll: | ||
| description: The last time the image has been polled to ensure the | ||
| image is up-to-date | ||
| format: date-time | ||
| type: string | ||
| required: | ||
| - latestImagePoll | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The deploy target is broken
(KUSTOMIZE) edit set image controller=${IMG}That should be
CONTROLLER_IMG