Skip to content

Commit

Permalink
Remove obsolete scaffold manifests (trustyai-explainability#75)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruivieira authored Jul 17, 2023
1 parent 3280f1c commit cb0e5a3
Show file tree
Hide file tree
Showing 14 changed files with 2 additions and 90 deletions.
2 changes: 1 addition & 1 deletion artifacts/examples/example-config-map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: trustyai-service-operator-config
data:
trustyaiServiceImageName: "quay.io/trustyai/trustyai-service"
trustyaiServiceImageTag: "alpha"
trustyaiServiceImageTag: "latest"
2 changes: 0 additions & 2 deletions config/base/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# This patch inject a sidecar container which is a HTTP proxy for the
# controller manager, it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
11 changes: 0 additions & 11 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
# This kustomization.yaml is not intended to be run by itself,
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/trustyai.opendatahub.io.trustyai.opendatahub.io_trustyaiservices.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
#- patches/webhook_in_trustyaiservices.yaml
#+kubebuilder:scaffold:crdkustomizewebhookpatch

# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
# patches here are for enabling the CA injection for each CRD
#- patches/cainjection_in_trustyaiservices.yaml
#+kubebuilder:scaffold:crdkustomizecainjectionpatch

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml
1 change: 0 additions & 1 deletion config/crd/kustomizeconfig.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file is for teaching kustomize how to substitute name and namespace reference in CRD
nameReference:
- kind: Service
version: v1
Expand Down
1 change: 0 additions & 1 deletion config/crd/patches/cainjection_in_trustyaiservices.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
1 change: 0 additions & 1 deletion config/crd/patches/webhook_in_trustyaiservices.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# The following patch enables a conversion webhook for the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
22 changes: 0 additions & 22 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,6 @@ spec:
labels:
control-plane: controller-manager
spec:
# TODO(user): Uncomment the following code to configure the nodeAffinity expression
# according to the platforms which are supported by your solution.
# It is considered best practice to support multiple architectures. You can
# build your manager image using the makefile target docker-buildx.
# affinity:
# nodeAffinity:
# requiredDuringSchedulingIgnoredDuringExecution:
# nodeSelectorTerms:
# - matchExpressions:
# - key: kubernetes.io/arch
# operator: In
# values:
# - amd64
# - arm64
# - ppc64le
# - s390x
# - key: kubernetes.io/os
# operator: In
# values:
# - linux
securityContext:
runAsNonRoot: true
seccompProfile:
Expand Down Expand Up @@ -74,8 +54,6 @@ spec:
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
# TODO(user): Configure the resources accordingly based on the project requirements.
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
limits:
cpu: 500m
Expand Down
24 changes: 1 addition & 23 deletions config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
# These resources constitute the fully configured set of manifests
# used to generate the 'manifests/' directory in a bundle.
resources:
- bases/trustyai-service-operator.clusterserviceversion.yaml
- ../default
- ../samples
- ../scorecard

# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
# These patches remove the unnecessary "cert" volume and its manager container volumeMount.
#patchesJson6902:
#- target:
# group: apps
# version: v1
# kind: Deployment
# name: controller-manager
# namespace: system
# patch: |-
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
# - op: remove
# path: /spec/template/spec/containers/1/volumeMounts/0
# # Remove the "cert" volume, since OLM will create and mount a set of certs.
# # Update the indices in this path if adding or removing volumes in the manager's Deployment.
# - op: remove
# path: /spec/template/spec/volumes/0
- ../scorecard
2 changes: 0 additions & 2 deletions config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

# Prometheus Monitor Service (Metrics)
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down
8 changes: 0 additions & 8 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
resources:
# All RBAC will be applied under this service account in
# the deployment namespace. You may comment out this resource
# if your manager will use a service account that exists at
# runtime. Be sure to update RoleBinding and ClusterRoleBinding
# subjects if changing service account names.
- service_account.yaml
- role.yaml
- role_binding.yaml
- leader_election_role.yaml
- leader_election_role_binding.yaml
# Comment the following 4 lines if you want to disable
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
# which protects your /metrics endpoint.
- auth_proxy_service.yaml
- auth_proxy_role.yaml
- auth_proxy_role_binding.yaml
Expand Down
1 change: 0 additions & 1 deletion config/rbac/leader_election_role.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# permissions to do leader election.
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
Expand Down
1 change: 0 additions & 1 deletion config/rbac/trustyaiservice_editor_role.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# permissions for end users to edit trustyaiservices.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
4 changes: 0 additions & 4 deletions config/samples/kustomization.yaml

This file was deleted.

This file was deleted.

0 comments on commit cb0e5a3

Please sign in to comment.