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.

Sign up for GitHub

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

Jump to bottom

Update deployment name and labels #358

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update deployment name and labels #358

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be89b43
Update deployment name
ajaypratap003 Sep 18, 2024
2bfc1f7
Merge remote-tracking branch 'upstream/main' into deployment-name-update
ajaypratap003 Sep 18, 2024
a072ca4
Merge remote-tracking branch 'upstream/main' into deployment-name-update
ajaypratap003 Sep 26, 2024
cf54ee1
regenerate manifests
ajaypratap003 Oct 3, 2024
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 ...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
creationTimestamp: null
labels:
control-plane: controller-manager
name: redhat-ods-operator-controller-manager-metrics-service
name: rhoai-operator-controller-manager-metrics-service
spec:
ports:
- name: https
Expand Down
12 changes: 3 additions & 9 deletions ....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: prometheus-k8s-viewer
name: rhoai-operator-metrics-reader
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason this clusterrole is updated?

Copy link
Author

@ajaypratap003 ajaypratap003 Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't update this manually. It updated by deployment name change after running make bundle cmd. This is new file with prefix rhoai which is generate by controller-gen.

rules:
- apiGroups:
- ""
resources:
- pods
- services
- endpoints
- nonResourceURLs:
- /metrics
verbs:
- get
- watch
- list
24 changes: 24 additions & 0 deletions bundle/manifests/rhoai-operator-webhook-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: v1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a question about this file #361 (comment)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VaishnaviHire Can you please confirm that we should keep this file or not in PR ?

kind: Service
metadata:
annotations:
service.beta.openshift.io/inject-cabundle: "true"
service.beta.openshift.io/serving-cert-secret-name: redhat-ods-operator-controller-webhook-cert
creationTimestamp: null
labels:
app.kubernetes.io/component: webhook
app.kubernetes.io/created-by: rhods-operator
app.kubernetes.io/instance: webhook-service
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: service
app.kubernetes.io/part-of: rhods-operator
name: rhoai-operator-webhook-service
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
control-plane: controller-manager
status:
loadBalancer: {}
10 changes: 5 additions & 5 deletions bundle/manifests/rhods-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
categories: AI/Machine Learning, Big Data
certified: "False"
containerImage: quay.io/opendatahub/opendatahub-operator:v2.0.0
createdAt: "2024-09-16T16:41:56Z"
createdAt: "2024-09-18T08:01:01Z"
features.operators.openshift.io/disconnected: "true"
features.operators.openshift.io/fips-compliant: "false"
features.operators.openshift.io/proxy-aware: "false"
Expand Down Expand Up @@ -1688,11 +1688,11 @@ spec:
- list
- patch
- watch
serviceAccountName: redhat-ods-operator-controller-manager
serviceAccountName: rhoai-operator-controller-manager
deployments:
- label:
control-plane: controller-manager
name: redhat-ods-operator-controller-manager
name: rhoai-operator-controller-manager
spec:
replicas: 1
selector:
Expand Down Expand Up @@ -1757,7 +1757,7 @@ spec:
readOnly: true
securityContext:
runAsNonRoot: true
serviceAccountName: redhat-ods-operator-controller-manager
serviceAccountName: rhoai-operator-controller-manager
terminationGracePeriodSeconds: 10
volumes:
- name: cert
Expand Down Expand Up @@ -1796,7 +1796,7 @@ spec:
- admissionReviewVersions:
- v1
containerPort: 443
deploymentName: redhat-ods-operator-controller-manager
deploymentName: rhoai-operator-controller-manager
failurePolicy: Fail
generateName: operator.opendatahub.io
rules:
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace: redhat-ods-operator
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: redhat-ods-operator-
namePrefix: rhoai-operator-

# Labels to add to all resources and selectors.
#labels:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/odh_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func testODHOperatorValidation(t *testing.T) {

func (tc *testContext) testRHOAIDeployment(t *testing.T) {
// Verify if the operator deployment is created
require.NoErrorf(t, tc.waitForOperatorDeployment("redhat-ods-operator-controller-manager", 1),
require.NoErrorf(t, tc.waitForOperatorDeployment("rhoai-operator-controller-manager", 1),
"error in validating rhoai operator deployment")
}

Expand Down
Loading