Skip to content

Commit c5b6262

Browse files
committed
WIP: fixup labels
Signed-off-by: Todd Short <[email protected]>
1 parent 4564e0f commit c5b6262

File tree

43 files changed

+139
-84
lines changed

Some content is hidden

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

43 files changed

+139
-84
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ manifests: $(CONTROLLER_GEN) $(KUSTOMIZE) #EXHELP Generate WebhookConfiguration,
166166
$(KUSTOMIZE) build $(KUSTOMIZE_EXPERIMENTAL_OVERLAY) > $(EXPERIMENTAL_MANIFEST)
167167
$(KUSTOMIZE) build $(KUSTOMIZE_EXPERIMENTAL_E2E_OVERLAY) > $(EXPERIMENTAL_E2E_MANIFEST)
168168

169+
helm-manifests: #EXHELP WIP: Make manifests via helm
170+
helm template olmv1 helm/olmv1 --values helm/standard.yaml > $(STANDARD_MANIFEST)
171+
helm template olmv1 helm/olmv1 --values helm/standard-e2e.yaml > $(STANDARD_E2E_MANIFEST)
172+
helm template olmv1 helm/olmv1 --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST)
173+
helm template olmv1 helm/olmv1 --values helm/experimental-e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
174+
169175
.PHONY: generate
170176
generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
171177
@find api cmd hack internal -name "zz_generated.deepcopy.go" -delete # Need to delete the files for them to be generated properly

helm/olmv1/templates/00-namespace.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
annotations:
66
{{- include "olmv1.annotations" . | nindent 4 }}
77
labels:
8+
app.kubernetes.io/name: olmv1
89
{{- include "olmv1.labels" . | nindent 4 }}
910
pod-security.kubernetes.io/enforce: restricted
1011
pod-security.kubernetes.io/enforce-version: latest

helm/olmv1/templates/01-customresourcedefinition-clustercatalogs.olm.operatorframework.io.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
7-
{{- include "olmv1.annotations" . | nindent 4}}
7+
{{- include "olmv1.annotations" . | nindent 4 }}
88
olm.operatorframework.io/generator: experimental
99
name: clustercatalogs.olm.operatorframework.io
1010
spec:

helm/olmv1/templates/02-customresourcedefinition-clusterextensions.olm.operatorframework.io.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
7-
{{- include "olmv1.annotations" . | nindent 4}}
7+
{{- include "olmv1.annotations" . | nindent 4 }}
88
olm.operatorframework.io/generator: experimental
99
name: clusterextensions.olm.operatorframework.io
1010
spec:

helm/olmv1/templates/03-serviceaccount-olmv1-system-catalogd-controller-manager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
annotations:
6-
{{- include "olmv1.annotations" . | nindent 4}}
6+
{{- include "olmv1.annotations" . | nindent 4 }}
77
labels:
88
app.kubernetes.io/name: catalogd
9-
app.kubernetes.io/part-of: olm
9+
{{- include "olmv1.labels" . | nindent 4 }}
1010
name: catalogd-controller-manager
1111
namespace: {{ .Values.namespaces.olmv1 }}
1212
{{- end }}

helm/olmv1/templates/04-serviceaccount-olmv1-system-operator-controller-controller-manager.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
annotations:
6-
{{- include "olmv1.annotations" . | nindent 4}}
6+
{{- include "olmv1.annotations" . | nindent 4 }}
7+
labels:
8+
app.kubernetes.io/name: operator-controller
9+
{{- include "olmv1.labels" . | nindent 4 }}
710
name: operator-controller-controller-manager
811
namespace: {{ .Values.namespaces.olmv1 }}
912
{{- end }}

helm/olmv1/templates/05-role-olmv1-system-catalogd-leader-election-role.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
annotations:
7-
{{- include "olmv1.annotations" . | nindent 4}}
7+
{{- include "olmv1.annotations" . | nindent 4 }}
88
labels:
99
app.kubernetes.io/name: catalogd
10-
app.kubernetes.io/part-of: olm
10+
{{- include "olmv1.labels" . | nindent 4 }}
1111
name: catalogd-leader-election-role
1212
namespace: {{ .Values.namespaces.olmv1 }}
1313
rules:

helm/olmv1/templates/06-role-olmv1-system-catalogd-manager-role.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
annotations:
7-
{{- include "olmv1.annotations" . | nindent 4}}
7+
{{- include "olmv1.annotations" . | nindent 4 }}
8+
labels:
9+
app.kubernetes.io/name: catalogd
10+
{{- include "olmv1.labels" . | nindent 4 }}
811
name: catalogd-manager-role
912
namespace: {{ .Values.namespaces.olmv1 }}
1013
rules:

helm/olmv1/templates/07-role-olmv1-system-operator-controller-leader-election-role.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
annotations:
7-
{{- include "olmv1.annotations" . | nindent 4}}
7+
{{- include "olmv1.annotations" . | nindent 4 }}
8+
labeles:
9+
app.kubernetes.io/name: operator-controller
10+
{{- include "olmv1.labels" . | nindent 4 }}
811
name: operator-controller-leader-election-role
912
namespace: {{ .Values.namespaces.olmv1 }}
1013
rules:

helm/olmv1/templates/08-role-olmv1-system-operator-controller-manager-role.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
annotations:
7-
{{- include "olmv1.annotations" . | nindent 4}}
7+
{{- include "olmv1.annotations" . | nindent 4 }}
8+
labels:
9+
app.kubernetes.io/name: operator-controller
10+
{{- include "olmv1.labels" . | nindent 4 }}
811
name: operator-controller-manager-role
912
namespace: {{ .Values.namespaces.olmv1 }}
1013
rules:

0 commit comments

Comments
 (0)