Skip to content

Commit

Permalink
Merge pull request #19 from kube-logging/rename
Browse files Browse the repository at this point in the history
rename project
  • Loading branch information
kristofgyuracz authored Feb 1, 2024
2 parents 1a72eec + 2a99086 commit ebd679c
Show file tree
Hide file tree
Showing 31 changed files with 294 additions and 296 deletions.
12 changes: 6 additions & 6 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ domain: kube-logging.dev
layout:
- go.kubebuilder.io/v4
multigroup: true
projectName: subscription-operator
repo: github.com/kube-logging/subscription-operator
projectName: telemetry-controller
repo: github.com/kube-logging/telemetry-controller
resources:
- api:
crdVersion: v1
Expand All @@ -16,30 +16,30 @@ resources:
domain: kube-logging.dev
group: telemetry
kind: Collector
path: github.com/kube-logging/subscription-operator/api/telemetry/v1alpha1
path: github.com/kube-logging/telemetry-controller/api/telemetry/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
domain: kube-logging.dev
group: telemetry
kind: Subscription
path: github.com/kube-logging/subscription-operator/api/telemetry/v1alpha1
path: github.com/kube-logging/telemetry-controller/api/telemetry/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
domain: kube-logging.dev
group: telemetry
kind: Tenant
path: github.com/kube-logging/subscription-operator/api/telemetry/v1alpha1
path: github.com/kube-logging/telemetry-controller/api/telemetry/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
domain: kube-logging.dev
group: telemetry
kind: OtelOutput
path: github.com/kube-logging/subscription-operator/api/telemetry/v1alpha1
path: github.com/kube-logging/telemetry-controller/api/telemetry/v1alpha1
version: v1alpha1
version: "3"
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# subscription-operator
# telemetry-controller
// TODO(user): Add simple overview of use/purpose

## Description
Expand All @@ -16,7 +16,7 @@
**Build and push your image to the location specified by `IMG`:**

```sh
make docker-build docker-push IMG=<some-registry>/subscription-operator:tag
make docker-build docker-push IMG=<some-registry>/telemetry-controller:tag
```

**NOTE:** This image ought to be published in the personal registry you specified.
Expand All @@ -32,7 +32,7 @@ make install
**Deploy the Manager to the cluster with the image specified by `IMG`:**

```sh
make deploy IMG=<some-registry>/subscription-operator:tag
make deploy IMG=<some-registry>/telemetry-controller:tag
```

> **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (

rbacv1 "k8s.io/api/rbac/v1"

telemetryv1alpha1 "github.com/kube-logging/subscription-operator/api/telemetry/v1alpha1"
controller "github.com/kube-logging/subscription-operator/internal/controller/telemetry"
telemetryv1alpha1 "github.com/kube-logging/telemetry-controller/api/telemetry/v1alpha1"
controller "github.com/kube-logging/telemetry-controller/internal/controller/telemetry"

// +kubebuilder:scaffold:imports

Expand Down
19 changes: 9 additions & 10 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Adds namespace to all resources.
namespace: subscription-operator-system
namespace: telemetry-controller-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: subscription-operator-
namePrefix: telemetry-controller-

# Labels to add to all resources and selectors.
#labels:
Expand All @@ -15,9 +15,9 @@ namePrefix: subscription-operator-
# someName: someValue

resources:
- ../crd
- ../rbac
- ../manager
- ../crd
- ../rbac
- ../manager
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
# crd/kustomization.yaml
#- ../webhook
Expand All @@ -27,11 +27,10 @@ resources:
#- ../prometheus

patches:
# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
# endpoint w/o any authn/z, please comment the following line.
- path: manager_auth_proxy_patch.yaml

# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
# endpoint w/o any authn/z, please comment the following line.
- path: manager_auth_proxy_patch.yaml
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
# crd/kustomization.yaml
#- path: manager_webhook_patch.yaml
Expand Down
74 changes: 37 additions & 37 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: namespace
app.kubernetes.io/instance: system
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
name: system
---
Expand All @@ -21,8 +21,8 @@ metadata:
app.kubernetes.io/name: deployment
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
spec:
selector:
Expand Down Expand Up @@ -66,38 +66,38 @@ spec:
# seccompProfile:
# type: RuntimeDefault
containers:
- command:
- /manager
args:
- --leader-elect
image: controller:latest
imagePullPolicy: IfNotPresent
name: manager
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 15
periodSeconds: 20
readinessProbe:
httpGet:
path: /readyz
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
memory: 128Mi
requests:
cpu: 10m
memory: 64Mi
- command:
- /manager
args:
- --leader-elect
image: controller:latest
imagePullPolicy: IfNotPresent
name: manager
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 15
periodSeconds: 20
readinessProbe:
httpGet:
path: /readyz
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
memory: 128Mi
requests:
cpu: 10m
memory: 64Mi
serviceAccountName: controller-manager
terminationGracePeriodSeconds: 10
4 changes: 2 additions & 2 deletions config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/name: servicemonitor
app.kubernetes.io/instance: controller-manager-metrics-monitor
app.kubernetes.io/component: metrics
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-monitor
namespace: system
Expand Down
12 changes: 6 additions & 6 deletions config/rbac/auth_proxy_client_clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: metrics-reader
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
name: metrics-reader
rules:
- nonResourceURLs:
- "/metrics"
verbs:
- get
- nonResourceURLs:
- "/metrics"
verbs:
- get
28 changes: 14 additions & 14 deletions config/rbac/auth_proxy_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: proxy-role
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
name: proxy-role
rules:
- apiGroups:
- authentication.k8s.io
resources:
- tokenreviews
verbs:
- create
- apiGroups:
- authorization.k8s.io
resources:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- authentication.k8s.io
resources:
- tokenreviews
verbs:
- create
- apiGroups:
- authorization.k8s.io
resources:
- subjectaccessreviews
verbs:
- create
10 changes: 5 additions & 5 deletions config/rbac/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ metadata:
app.kubernetes.io/name: clusterrolebinding
app.kubernetes.io/instance: proxy-rolebinding
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
name: proxy-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: proxy-role
subjects:
- kind: ServiceAccount
name: controller-manager
namespace: system
- kind: ServiceAccount
name: controller-manager
namespace: system
12 changes: 6 additions & 6 deletions config/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ metadata:
app.kubernetes.io/name: service
app.kubernetes.io/instance: controller-manager-metrics-service
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: subscription-operator
app.kubernetes.io/part-of: subscription-operator
app.kubernetes.io/created-by: telemetry-controller
app.kubernetes.io/part-of: telemetry-controller
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-service
namespace: system
spec:
ports:
- name: https
port: 8443
protocol: TCP
targetPort: https
- name: https
port: 8443
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager
Loading

0 comments on commit ebd679c

Please sign in to comment.