Skip to content

Commit 69b2796

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #774 from ecordell/api-v1
chore(api): bump operatorgroup and packagemanifest to v1
2 parents 280c674 + 405f061 commit 69b2796

File tree

121 files changed

+1752
-1115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1752
-1115
lines changed

‎Documentation/install/local-values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ package:
2929
pullPolicy: IfNotPresent
3030
service:
3131
internalPort: 5443
32+
tolerations:
33+
- operator: Exists
3234

3335
catalog_sources:
3436
- rh-operators

‎Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ container:
103103

104104
clean-e2e:
105105
kubectl delete crds --all
106-
kubectl delete apiservices.apiregistration.k8s.io v1alpha1.packages.apps.redhat.com || true
106+
kubectl delete apiservices.apiregistration.k8s.io v1.packages.operators.coreos.com || true
107107
kubectl delete -f test/e2e/resources/0000_50_olm_00-namespace.yaml
108108

109109
clean:
@@ -127,9 +127,9 @@ codegen:
127127
cp scripts/generate_groups.sh vendor/k8s.io/code-generator/generate_groups.sh
128128
mkdir -p vendor/k8s.io/code-generator/hack
129129
cp boilerplate.go.txt vendor/k8s.io/code-generator/hack/boilerplate.go.txt
130-
go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr -i ./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/version,./pkg/package-server/apis/packagemanifest/v1alpha1,./pkg/api/apis/operators/v1alpha1 -p $(PKG)/pkg/package-server/apis/openapi -O zz_generated.openapi -h boilerplate.go.txt -r /dev/null
131-
$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis "operators:v1alpha1,v1alpha2"
132-
$(CODEGEN) all $(PKG)/pkg/package-server/client $(PKG)/pkg/package-server/apis "packagemanifest:v1alpha1"
130+
go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr -i ./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/version,./pkg/package-server/apis/packagemanifest/v1,./pkg/api/apis/operators/v1alpha1 -p $(PKG)/pkg/package-server/apis/openapi -O zz_generated.openapi -h boilerplate.go.txt -r /dev/null
131+
$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis "operators:v1alpha1,v1"
132+
$(CODEGEN) all $(PKG)/pkg/package-server/client $(PKG)/pkg/package-server/apis "packagemanifest:v1"
133133

134134
container-codegen:
135135
docker build -t olm:codegen -f codegen.Dockerfile .

‎deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ spec:
6262
httpGet:
6363
path: /healthz
6464
port: {{ .Values.catalog.service.internalPort }}
65+
env:
66+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
67+
- name: RELEASE_VERSION
68+
value: "0.0.1-snapshot"
69+
{{ end }}
6570
{{- if .Values.catalog.resources }}
6671
resources:
6772
{{ toYaml .Values.catalog.resources | indent 12 }}

‎deploy/chart/templates/0000_50_olm_10-operatorgroup.crd.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ metadata:
44
name: operatorgroups.operators.coreos.com
55
spec:
66
group: operators.coreos.com
7-
version: v1alpha2
7+
version: v1
88
versions:
9-
- name: v1alpha2
10-
served: true
11-
storage: true
9+
- name: v1
10+
served: true
11+
storage: true
12+
- name: v1alpha2
13+
served: true
14+
storage: false
1215
names:
1316
plural: operatorgroups
1417
singular: operatorgroup
@@ -91,4 +94,4 @@ spec:
9194
- lastUpdated
9295
type: object
9396
required:
94-
- metadata
97+
- metadata

‎deploy/chart/templates/0000_50_olm_11-olm-operators.configmap.yaml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,9 @@ apiVersion: v1
33
metadata:
44
name: olm-operators
55
namespace: {{ .Values.catalog_namespace }}
6-
{{ $root := . }}
76
data:
87
customResourceDefinitions: |-
9-
{{- range $path, $bytes := .Files.Glob "catalog_resources/olm-operators/**.crd.yaml" }}
10-
{{- range $index, $line := $root.Files.Lines $path }}
11-
{{- if eq $index 0 }}
12-
{{- $line | printf "%s%s" "- " | nindent 4 }}
13-
{{- else }}
14-
{{- $line | nindent 6 }}
15-
{{- end }}
16-
{{- end }}
17-
{{- end }}
18-
clusterServiceVersions: |-
8+
clusterServiceVersions: |-
199
{{- include "packageserver.clusterserviceversion" . | nindent 4 }}
20-
{{- range $path, $bytes := .Files.Glob "catalog_resources/olm-operators/**.clusterserviceversion.yaml" }}
21-
{{- range $index, $line := $root.Files.Lines $path }}
22-
{{- if eq $index 0 }}
23-
{{- $line | printf "%s%s" "- " | nindent 4 }}
24-
{{- else }}
25-
{{- $line | nindent 6 }}
26-
{{- end }}
27-
{{- end }}
28-
{{- end }}
2910
packages: |-
30-
{{- include "packageserver.package" . | nindent 4 }}
31-
{{- range $path, $bytes := .Files.Glob "catalog_resources/olm-operators/**.package.yaml" }}
32-
{{- range $index, $line := $root.Files.Lines $path }}
33-
{{- if eq $index 0 }}
34-
{{- $line | printf "%s%s" "- " | nindent 4 }}
35-
{{- else }}
36-
{{- $line | nindent 6 }}
37-
{{- end }}
38-
{{- end }}
39-
{{- end }}
40-
11+
{{- include "packageserver.package" . | nindent 4 }}

‎deploy/chart/templates/0000_50_olm_13-operatorgroup-default.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
apiVersion: operators.coreos.com/v1alpha2
1+
apiVersion: operators.coreos.com/v1
22
kind: OperatorGroup
33
metadata:
44
name: global-operators
55
namespace: {{ .Values.operator_namespace }}
66
---
7-
apiVersion: operators.coreos.com/v1alpha2
7+
apiVersion: operators.coreos.com/v1
88
kind: OperatorGroup
99
metadata:
1010
name: olm-operators

‎deploy/chart/templates/0000_50_olm_16-packageserver.clusterserviceversion.yaml

Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,3 @@
11
{{ if and .Values.installType (eq .Values.installType "ocp") }}
2-
# keep in sync with _packageserver.clusterserviceversion.yaml
3-
apiVersion: operators.coreos.com/v1alpha1
4-
kind: ClusterServiceVersion
5-
metadata:
6-
name: packageserver.v{{ .Chart.Version }}
7-
namespace: {{ .Values.namespace }}
8-
spec:
9-
displayName: Package Server
10-
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
11-
minKubeVersion: {{ .Values.minKubeVersion }}
12-
keywords: ['packagemanifests', 'olm', 'packages']
13-
maintainers:
14-
- name: Red Hat
15-
email: [email protected]
16-
provider:
17-
name: Red Hat
18-
links:
19-
- name: Package Server
20-
url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
21-
installModes:
22-
- type: OwnNamespace
23-
supported: true
24-
- type: SingleNamespace
25-
supported: true
26-
- type: MultiNamespace
27-
supported: true
28-
- type: AllNamespaces
29-
supported: true
30-
install:
31-
strategy: deployment
32-
spec:
33-
clusterPermissions:
34-
- serviceAccountName: packageserver
35-
rules:
36-
- apiGroups:
37-
- ""
38-
resources:
39-
- configmaps
40-
verbs:
41-
- get
42-
- list
43-
- watch
44-
- apiGroups:
45-
- operators.coreos.com
46-
resources:
47-
- catalogsources
48-
verbs:
49-
- get
50-
- list
51-
- watch
52-
- apiGroups:
53-
- packages.apps.redhat.com
54-
resources:
55-
- packagemanifests
56-
verbs:
57-
- get
58-
- list
59-
deployments:
60-
- name: packageserver
61-
{{- include "packageserver.deployment-spec" . | indent 8 }}
62-
maturity: alpha
63-
version: {{ .Chart.Version }}
64-
apiservicedefinitions:
65-
owned:
66-
- group: packages.apps.redhat.com
67-
version: v1alpha1
68-
kind: PackageManifest
69-
name: packagemanifest
70-
displayName: PackageManifest
71-
description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
72-
deploymentName: packageserver
73-
containerPort: {{ .Values.package.service.internalPort }}
74-
{{ end }}
2+
{{- include "packageserver.clusterserviceversion" . }}
3+
{{- end }}

‎deploy/chart/templates/0000_50_olm_17-packageserver.deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{{ if and .Values.installType (eq .Values.installType "ocp") }}
1+
{{- if and .Values.installType (eq .Values.installType "ocp") -}}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: packageserver
66
namespace: {{ .Values.namespace }}
77
labels:
88
app: packageserver
9-
{{- include "packageserver.deployment-spec" . }}
10-
{{ end }}
9+
{{- include "packageserver.deployment-spec" . | nindent 0 }}
10+
{{- end }}

‎deploy/chart/templates/0000_50_olm_18-upstream-operators.catalogsource.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#! validate-crd: ./deploy/chart/templates/06-catalogsource.crd.yaml
2-
#! parse-kind: CatalogSource
3-
{{ if and .Values.installType (eq .Values.installType "upstream") }}
1+
{{- if and .Values.installType (eq .Values.installType "upstream") -}}
42
apiVersion: operators.coreos.com/v1alpha1
53
kind: CatalogSource
64
metadata:
@@ -11,4 +9,4 @@ spec:
119
image: quay.io/operator-framework/upstream-community-operators:latest
1210
displayName: Community Operators
1311
publisher: OperatorHub.io
14-
{{ end }}
12+
{{- end }}

‎deploy/chart/templates/_packageserver.clusterserviceversion.yaml

Lines changed: 13 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- define "packageserver.clusterserviceversion" }}
1+
{{- define "packageserver.clusterserviceversion" -}}
22
- apiVersion: operators.coreos.com/v1alpha1
33
kind: ClusterServiceVersion
44
metadata:
@@ -32,6 +32,13 @@
3232
clusterPermissions:
3333
- serviceAccountName: packageserver
3434
rules:
35+
- apiGroups:
36+
- authorization.k8s.io
37+
resources:
38+
- subjectaccessreviews
39+
verbs:
40+
- create
41+
- get
3542
- apiGroups:
3643
- ""
3744
resources:
@@ -49,78 +56,25 @@
4956
- list
5057
- watch
5158
- apiGroups:
52-
- "packages.apps.redhat.com"
59+
- "packages.operators.coreos.com"
5360
resources:
5461
- packagemanifests
5562
verbs:
5663
- get
5764
- list
5865
deployments:
5966
- name: packageserver
60-
spec:
61-
replicas: {{ .Values.package.replicaCount }}
62-
strategy:
63-
type: RollingUpdate
64-
selector:
65-
matchLabels:
66-
app: packageserver
67-
template:
68-
metadata:
69-
labels:
70-
app: packageserver
71-
spec:
72-
serviceAccountName: packageserver
73-
{{- if .Values.olm.nodeSelector }}
74-
nodeSelector:
75-
{{ toYaml .Values.package.nodeSelector | indent 18 }}
76-
{{- end }}
77-
{{- if .Values.olm.tolerations }}
78-
tolerations:
79-
{{ toYaml .Values.package.tolerations | indent 18 }}
80-
{{- end }}
81-
containers:
82-
- name: packageserver
83-
command:
84-
- /bin/package-server
85-
- -v=4
86-
{{- if .Values.watchedNamespaces }}
87-
- --watched-namespaces
88-
- {{ .Values.watchedNamespaces }}
89-
{{- end }}
90-
- --secure-port
91-
- {{ .Values.package.service.internalPort | quote }}
92-
- --global-namespace
93-
- {{ .Values.namespace }}
94-
{{- if .Values.debug }}
95-
- --debug
96-
{{- end }}
97-
{{- if .Values.package.commandArgs }}
98-
- {{ .Values.package.commandArgs }}
99-
{{- end }}
100-
image: {{ .Values.package.image.ref }}
101-
imagePullPolicy: {{ .Values.package.image.pullPolicy }}
102-
ports:
103-
- containerPort: {{ .Values.package.service.internalPort }}
104-
livenessProbe:
105-
httpGet:
106-
scheme: HTTPS
107-
path: /healthz
108-
port: {{ .Values.package.service.internalPort }}
109-
readinessProbe:
110-
httpGet:
111-
scheme: HTTPS
112-
path: /healthz
113-
port: {{ .Values.package.service.internalPort }}
67+
{{- include "packageserver.deployment-spec" . | nindent 10 }}
11468
maturity: alpha
11569
version: {{ .Chart.Version }}
11670
apiservicedefinitions:
11771
owned:
118-
- group: packages.apps.redhat.com
119-
version: v1alpha1
72+
- group: packages.operators.coreos.com
73+
version: v1
12074
kind: PackageManifest
12175
name: packagemanifests
12276
displayName: PackageManifest
12377
description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
12478
deploymentName: packageserver
12579
containerPort: {{ .Values.package.service.internalPort }}
126-
{{- end }}
80+
{{- end -}}

0 commit comments

Comments
 (0)