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(operator): Fix operator release pipeline warnings #14817

Merged
merged 2 commits into from
Nov 7, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.7.0
createdAt: "2024-11-07T09:40:12Z"
createdAt: "2024-11-07T12:42:51Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down Expand Up @@ -1771,7 +1771,7 @@ spec:
- update
- watch
- apiGroups:
- policy
- policy/v1
JoaoBraveCoding marked this conversation as resolved.
Show resolved Hide resolved
resources:
- poddisruptionbudgets
verbs:
Expand Down Expand Up @@ -1880,7 +1880,10 @@ spec:
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
resources: {}
resources:
requests:
cpu: 200m
memory: 256Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand All @@ -1904,7 +1907,10 @@ spec:
ports:
- containerPort: 8443
name: https
resources: {}
resources:
requests:
cpu: 200m
memory: 256Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.7.0
createdAt: "2024-11-07T09:40:10Z"
createdAt: "2024-11-07T12:42:49Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -1751,7 +1751,7 @@ spec:
- update
- watch
- apiGroups:
- policy
- policy/v1
resources:
- poddisruptionbudgets
verbs:
Expand Down Expand Up @@ -1860,7 +1860,10 @@ spec:
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
resources: {}
resources:
requests:
cpu: 200m
memory: 256Mi
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: webhook-cert
Expand All @@ -1878,7 +1881,10 @@ spec:
ports:
- containerPort: 8443
name: https
resources: {}
resources:
requests:
cpu: 200m
memory: 256Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
createdAt: "2024-11-07T09:40:14Z"
createdAt: "2024-11-07T12:42:53Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down Expand Up @@ -1756,7 +1756,7 @@ spec:
- update
- watch
- apiGroups:
- policy
- policy/v1
resources:
- poddisruptionbudgets
verbs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ images:

patches:
- path: manager_related_image_patch.yaml
- path: manager_resource_reqs_patch.yaml
- path: prometheus_service_monitor_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@ spec:
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
value: quay.io/observatorium/opa-openshift:latest
resources:
requests:
cpu: 200m
memory: 256Mi
- name: kube-rbac-proxy
resources:
requests:
cpu: 200m
memory: 256Mi
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
spec:
template:
spec:
containers:
- name: manager
resources:
requests:
cpu: 200m
memory: 256Mi
- name: kube-rbac-proxy
resources:
requests:
cpu: 200m
memory: 256Mi
1 change: 1 addition & 0 deletions operator/config/overlays/community/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ images:
patches:
- path: manager_auth_proxy_patch.yaml
- path: manager_related_image_patch.yaml
- path: manager_resource_reqs_patch.yaml
- path: manager_run_flags_patch.yaml
- path: manager_webhook_patch.yaml
- path: webhookcainjection_patch.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ spec:
ports:
- containerPort: 8443
name: https
resources:
requests:
cpu: 200m
memory: 256Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
spec:
template:
spec:
containers:
- name: manager
resources:
requests:
cpu: 200m
memory: 256Mi
- name: kube-rbac-proxy
resources:
requests:
cpu: 200m
memory: 256Mi
2 changes: 1 addition & 1 deletion operator/config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ rules:
- update
- watch
- apiGroups:
- policy
- policy/v1
resources:
- poddisruptionbudgets
verbs:
Expand Down
2 changes: 1 addition & 1 deletion operator/docs/operator/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The Loki Operator uses client-go to communicate with Kubernetes clusters. The su

Due to the use of CustomResourceDefinitions Kubernetes >= v1.7.0 is required.

Due to the use of apiextensions.k8s.io/v1 CustomResourceDefinitions, requires Kubernetes >= v1.16.0.
Due to the use of apiextensions.k8s.io/v1 CustomResourceDefinitions, requires Kubernetes >= v1.21.0.

## Loki

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ type LokiStackReconciler struct {
// +kubebuilder:rbac:urls=/api/v2/alerts,verbs=create
// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;create;update
// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update
// +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch;create;update
// +kubebuilder:rbac:groups=policy/v1,resources=poddisruptionbudgets,verbs=get;list;watch;create;update
// +kubebuilder:rbac:groups=config.openshift.io,resources=dnses;apiservers;proxies,verbs=get;list;watch
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=get;list;watch;create;update;delete
// +kubebuilder:rbac:groups=cloudcredential.openshift.io,resources=credentialsrequests,verbs=get;list;watch;create;update;delete
Expand Down
Loading