Skip to content

Commit

Permalink
*: Rename organization to kube-reporting.
Browse files Browse the repository at this point in the history
  • Loading branch information
timflannagan committed Apr 23, 2020
1 parent 059d7b7 commit 6248430
Show file tree
Hide file tree
Showing 135 changed files with 313 additions and 313 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.reporting-operator
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM openshift/origin-release:golang-1.13 as build

COPY . /go/src/github.com/kubernetes-reporting/metering-operator
WORKDIR /go/src/github.com/kubernetes-reporting/metering-operator
COPY . /go/src/github.com/kube-reporting/metering-operator
WORKDIR /go/src/github.com/kube-reporting/metering-operator

ENV GOCACHE='/tmp'
RUN make reporting-operator-bin RUN_UPDATE_CODEGEN=false CHECK_GO_FILES=false
Expand All @@ -11,7 +11,7 @@ FROM centos:7
RUN yum install --setopt=skip_missing_names_on_install=False -y \
ca-certificates bash

COPY --from=build /go/src/github.com/kubernetes-reporting/metering-operator/bin/reporting-operator /usr/local/bin/reporting-operator
COPY --from=build /go/src/github.com/kube-reporting/metering-operator/bin/reporting-operator /usr/local/bin/reporting-operator

LABEL io.k8s.display-name="OpenShift metering-reporting-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages collecting data from monitoring and running reports." \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.reporting-operator.okd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM openshift/origin-release:golang-1.13 as build

COPY . /go/src/github.com/kubernetes-reporting/metering-operator
WORKDIR /go/src/github.com/kubernetes-reporting/metering-operator
COPY . /go/src/github.com/kube-reporting/metering-operator
WORKDIR /go/src/github.com/kube-reporting/metering-operator

ENV GOCACHE='/tmp'

Expand All @@ -13,7 +13,7 @@ RUN yum clean all && rm -rf /var/cache/yum/* && \
yum install --setopt=skip_missing_names_on_install=False -y \
ca-certificates bash

COPY --from=build /go/src/github.com/kubernetes-reporting/metering-operator/bin/reporting-operator /usr/local/bin/reporting-operator
COPY --from=build /go/src/github.com/kube-reporting/metering-operator/bin/reporting-operator /usr/local/bin/reporting-operator

LABEL io.k8s.display-name="OpenShift metering-reporting-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages collecting data from monitoring and running reports." \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.reporting-operator.rhel
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM openshift/golang-builder:1.13 AS build

COPY . /go/src/github.com/kubernetes-reporting/metering-operator
WORKDIR /go/src/github.com/kubernetes-reporting/metering-operator
COPY . /go/src/github.com/kube-reporting/metering-operator
WORKDIR /go/src/github.com/kube-reporting/metering-operator

ENV GOCACHE='/tmp'
RUN make reporting-operator-bin RUN_UPDATE_CODEGEN=false CHECK_GO_FILES=false
Expand All @@ -11,7 +11,7 @@ FROM openshift/ose-base:latest
RUN yum install --setopt=skip_missing_names_on_install=False -y \
ca-certificates bash

COPY --from=build /go/src/github.com/kubernetes-reporting/metering-operator/bin/reporting-operator /usr/local/bin/reporting-operator
COPY --from=build /go/src/github.com/kube-reporting/metering-operator/bin/reporting-operator /usr/local/bin/reporting-operator

LABEL io.k8s.display-name="OpenShift metering-reporting-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages collecting data from monitoring and running reports." \
Expand Down
28 changes: 14 additions & 14 deletions Documentation/dev/builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Each of them is built slightly differently.
- Written in Go
- Source is primarily in `pkg/`, and `cmd/` of this repo.
- origin
- source is https://github.com/kubernetes-reporting/metering-operator
- source is https://github.com/kube-reporting/metering-operator
- Dockerfile is `Dockerfile.reporting-operator`
- Docker image is [quay.io/openshift/origin-metering-reporting-operator](https://quay.io/repository/openshift/origin-metering-reporting-operator)
- Built by origin CI using prow/ci-operator
Expand All @@ -23,7 +23,7 @@ Each of them is built slightly differently.
- Written using mostly bash, jq, python and helm charts.
- Source is primarily in `charts/`, `images/helm-operator/`
- origin
- Source: https://github.com/kubernetes-reporting/metering-operator
- Source: https://github.com/kube-reporting/metering-operator
- Dockerfile is `Dockerfile.metering-operator`
- Docker image is [quay.io/openshift/origin-metering-helm-operator](https://quay.io/repository/openshift/origin-metering-helm-operator)
- Built by origin CI using prow/ci-operator
Expand All @@ -37,55 +37,55 @@ Each of them is built slightly differently.
- helm
- Written in Go
- origin
- Source is https://github.com/kubernetes-reporting/helm/blob/master
- Dockerfile is https://github.com/kubernetes-reporting/helm/blob/master/Dockerfile
- Source is https://github.com/kube-reporting/helm/blob/master
- Dockerfile is https://github.com/kube-reporting/helm/blob/master/Dockerfile
- Docker image is [quay.io/openshift/origin-metering-helm](https://quay.io/repository/openshift/origin-metering-helm)
- Build by origin CI using prow/ci-operator
- OCP
- Source is http://pkgs.devel.redhat.com/cgit/containers/ose-metering-helm/
- OCP Dockerfile is https://github.com/kubernetes-reporting/helm/blob/master/Dockerfile.rhel
- OCP Dockerfile is https://github.com/kube-reporting/helm/blob/master/Dockerfile.rhel
- OCP Docker image is TBD
- Built in brew by OSBS
- brew package name: `ose-metering-helm-container`
- url: https://brewweb.engineering.redhat.com/brew/packageinfo?packageID=70736
- presto
- Written in Java, uses [maven][maven] as a project build tool.
- origin
- Source is https://github.com/kubernetes-reporting/presto/tree/master
- Dockerfile is https://github.com/kubernetes-reporting/presto/blob/master/Dockerfile
- Source is https://github.com/kube-reporting/presto/tree/master
- Dockerfile is https://github.com/kube-reporting/presto/blob/master/Dockerfile
- Docker image is [quay.io/openshift/origin-metering-presto](https://quay.io/repository/openshift/origin-metering-presto)
- Build by origin CI using prow/ci-operator
- OCP
- Source is http://pkgs.devel.redhat.com/cgit/containers/presto/
- OCP Dockerfile is https://github.com/kubernetes-reporting/presto/blob/master/Dockerfile.rhel
- OCP Dockerfile is https://github.com/kube-reporting/presto/blob/master/Dockerfile.rhel
- OCP Docker image is TBD
- Built in brew by OSBS
- brew package name: `presto-container`
- url: https://brewweb.engineering.redhat.com/brew/packageinfo?packageID=70772
- hive
- Written in Java, uses [maven][maven] as a project build tool.
- origin
- Source is https://github.com/kubernetes-reporting/hive/tree/master
- Dockerfile is https://github.com/kubernetes-reporting/hive/tree/master/Dockerfile
- Source is https://github.com/kube-reporting/hive/tree/master
- Dockerfile is https://github.com/kube-reporting/hive/tree/master/Dockerfile
- Docker image is [quay.io/openshift/origin-metering-hive](https://quay.io/repository/openshift/origin-metering-hive)
- Build by origin CI using prow/ci-operator
- OCP
- Source is http://pkgs.devel.redhat.com/cgit/containers/hive/
- OCP Dockerfile is https://github.com/kubernetes-reporting/hive/tree/master/Dockerfile.rhel
- OCP Dockerfile is https://github.com/kube-reporting/hive/tree/master/Dockerfile.rhel
- OCP Docker image is TBD
- Built in brew by OSBS
- brew package name: `hive-container`
- url: https://brewweb.engineering.redhat.com/brew/packageinfo?packageID=70894
- hadoop
- Written in Java, uses [maven][maven] as a project build tool.
- origin
- Source is https://github.com/kubernetes-reporting/hadoop/tree/master
- Dockerfile is https://github.com/kubernetes-reporting/hadoop/tree/master/Dockerfile
- Source is https://github.com/kube-reporting/hadoop/tree/master
- Dockerfile is https://github.com/kube-reporting/hadoop/tree/master/Dockerfile
- Docker image is [quay.io/openshift/origin-metering-hadoop](https://quay.io/repository/openshift/origin-metering-hadoop)
- Build by origin CI using prow/ci-operator
- OCP
- Source is http://pkgs.devel.redhat.com/cgit/containers/hadoop/
- OCP Dockerfile is https://github.com/kubernetes-reporting/hadoop/tree/master/Dockerfile.rhel
- OCP Dockerfile is https://github.com/kube-reporting/hadoop/tree/master/Dockerfile.rhel
- OCP Docker image is TBD
- Built in brew by OSBS
- brew package name: `hadoop-container`
Expand Down
2 changes: 1 addition & 1 deletion Documentation/dev/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $ pip3 install operator-courier
Clone this repository:

```bash
git clone https://github.com/kubernetes-reporting/metering-operator
git clone https://github.com/kube-reporting/metering-operator
```

## Building
Expand Down
2 changes: 1 addition & 1 deletion Documentation/reports.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ The execution of a scheduled report can be tracked using its status field. Any e

The `status` field of a `Report` currently has two fields:

- `conditions`: Conditions is a list of conditions, each of which have a `type`, `status`, `reason`, and `message` field. Possible values of a condition's `type` field are `Running` and `Failure`, indicating the current state of the scheduled report. The `reason` indicates why its `condition` is in its current state with the `status` being either `true`, `false` or `unknown`. The `message` provides a human readable indicating why the condition is in the current state. For detailed information on the `reason` values see [`pkg/apis/metering/v1/util/report_util.go`](https://github.com/kubernetes-reporting/metering-operator/blob/master/pkg/apis/metering/v1/util/report_util.go#L10).
- `conditions`: Conditions is a list of conditions, each of which have a `type`, `status`, `reason`, and `message` field. Possible values of a condition's `type` field are `Running` and `Failure`, indicating the current state of the scheduled report. The `reason` indicates why its `condition` is in its current state with the `status` being either `true`, `false` or `unknown`. The `message` provides a human readable indicating why the condition is in the current state. For detailed information on the `reason` values see [`pkg/apis/metering/v1/util/report_util.go`](https://github.com/kube-reporting/metering-operator/blob/master/pkg/apis/metering/v1/util/report_util.go#L10).
- `lastReportTime`: Indicates the time Metering has collected data up to.

[rfc3339]: https://tools.ietf.org/html/rfc3339#section-5.8
Expand Down
2 changes: 1 addition & 1 deletion Documentation/writing-custom-queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ AND "timestamp" < timestamp '{| default .Report.ReportingEnd .Report.Inputs.Repo

Queries should be [left-closed and right-open](https://en.wikipedia.org/wiki/Interval_(mathematics)#Classification_of_intervals); that is, we should collect data with timestamps equal to or greater than the start time and less than the end time, as seen in the example above.

In addition to the query time constraints, we often want to be able to track the time period for each row of data. In order to do this, we can append two columns to the above schema definition: `period_start` and `period_end` and remove "timestamp", since we're looking at a range of time rather than an instant in time. Both of these columns will be of type `timestamp`, which requires us to add an additional field, `spec.input`, to our `ReportQuery` as this is a custom input. To see more about `spec.inputs`, `ReportingStart`, and `ReportingEnd` see [reports.md.](https://github.com/kubernetes-reporting/metering-operator/blob/master/Documentation/reports.md#reportingstart)
In addition to the query time constraints, we often want to be able to track the time period for each row of data. In order to do this, we can append two columns to the above schema definition: `period_start` and `period_end` and remove "timestamp", since we're looking at a range of time rather than an instant in time. Both of these columns will be of type `timestamp`, which requires us to add an additional field, `spec.input`, to our `ReportQuery` as this is a custom input. To see more about `spec.inputs`, `ReportingStart`, and `ReportingEnd` see [reports.md.](https://github.com/kube-reporting/metering-operator/blob/master/Documentation/reports.md#reportingstart)
Lastly, we need to update the SELECT portion of the `spec.query` field:

```
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ROOT_DIR:= $(patsubst %/,%,$(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
include build/check_defined.mk

# Package
GO_PKG := github.com/kubernetes-reporting/metering-operator
GO_PKG := github.com/kube-reporting/metering-operator
REPORTING_OPERATOR_PKG := $(GO_PKG)/cmd/reporting-operator
DEPLOY_METERING_PKG := $(GO_PKG)/cmd/deploy-metering
# these are directories/files which get auto-generated or get reformated by
Expand Down Expand Up @@ -111,8 +111,8 @@ unit-docker: metering-src-docker-build
docker run \
--rm \
-t \
-w /go/src/github.com/kubernetes-reporting/metering-operator \
-v $(PWD):/go/src/github.com/kubernetes-reporting/metering-operator \
-w /go/src/github.com/kube-reporting/metering-operator \
-v $(PWD):/go/src/github.com/kube-reporting/metering-operator \
$(METERING_SRC_IMAGE_REPO):$(METERING_SRC_IMAGE_TAG) \
make unit

Expand Down Expand Up @@ -142,9 +142,9 @@ e2e-docker: metering-src-docker-build
-e REPORTING_OPERATOR_IMAGE_REPO -e REPORTING_OPERATOR_IMAGE_TAG \
-e KUBECONFIG=/kubeconfig \
-e TEST_OUTPUT_PATH=/out \
-w /go/src/github.com/kubernetes-reporting/metering-operator \
-w /go/src/github.com/kube-reporting/metering-operator \
-v $(KUBECONFIG):/kubeconfig \
-v $(PWD):/go/src/github.com/kubernetes-reporting/metering-operator \
-v $(PWD):/go/src/github.com/kube-reporting/metering-operator \
-v /out \
$(METERING_SRC_IMAGE_REPO):$(METERING_SRC_IMAGE_TAG) \
make e2e
Expand Down Expand Up @@ -188,8 +188,8 @@ verify-docker: metering-src-docker-build
docker run \
--rm \
-t \
-w /go/src/github.com/kubernetes-reporting/metering-operator \
-v $(PWD):/go/src/github.com/kubernetes-reporting/metering-operator \
-w /go/src/github.com/kube-reporting/metering-operator \
-v $(PWD):/go/src/github.com/kube-reporting/metering-operator \
$(METERING_SRC_IMAGE_REPO):$(METERING_SRC_IMAGE_TAG) \
make verify

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Overview

This project is a component of the [Kubernetes Reporting organization](https://github.com/kubernetes-reporting), an open source toolkit to manage Kubernetes native applications, called Operators, in an effective, automated, and scalable way.
This project is a component of the [Kubernetes Reporting organization](https://github.com/kube-reporting), an open source toolkit to manage Kubernetes native applications, called Operators, in an effective, automated, and scalable way.
Read more in the [introduction blog post](https://coreos.com/blog/introducing-operator-framework-metering).

Metering records historical cluster usage and can generate usage reports showing usage breakdowns by pod or namespace over arbitrary time periods.
Expand Down
2 changes: 1 addition & 1 deletion bill-of-materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
]
},
{
"project": "github.com/kubernetes-reporting/metering-operator",
"project": "github.com/kube-reporting/metering-operator",
"licenses": [
{
"type": "Apache License 2.0",
Expand Down
4 changes: 2 additions & 2 deletions charts/metering-ansible-operator/templates/crds/hive.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
description: |
HiveTableSpec is the desired specification of a HiveTable custom resource.
Required fields: database, tableName, and columns.
More info: https://github.com/kubernetes-reporting/metering-operator/blob/master/Documentation/hivetables.md
More info: https://github.com/kube-reporting/metering-operator/blob/master/Documentation/hivetables.md
required:
- databaseName
- tableName
Expand All @@ -46,7 +46,7 @@ spec:
description: |
DatabaseName is the name of the Hive database to use.
Generally, this field should be set to "default", or the value of the "databaseName" in a Hive StorageLocation.
More info: https://github.com/kubernetes-reporting/metering-operator/blob/master/Documentation/storagelocations.md
More info: https://github.com/kube-reporting/metering-operator/blob/master/Documentation/storagelocations.md
minLength: 1
tableName:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
PrestoTableSpec is the desired specification of a PrestoTable custom resource.
Required fields: unmanaged, catalog, schema, tableName. Note: columns is required when unmanaged is set to false.
Optional fields: query, view, createTableAs, properties, and comment.
More info: https://github.com/kubernetes-reporting/metering-operator/blob/master/Documentation/prestotables.md
More info: https://github.com/kube-reporting/metering-operator/blob/master/Documentation/prestotables.md
required:
- unmanaged
- catalog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
required:
- spec
properties:
# note: see https://github.com/kubernetes-reporting/metering-operator/blob/master/Documentation/reports.md for more information
# note: see https://github.com/kube-reporting/metering-operator/blob/master/Documentation/reports.md for more information
# note: apiVersion, kind, metadata is implicitly validated by API server
spec:
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
description: |
StorageLocationSpec is the desired specification of a StorageLocation custom resource.
Required fields: databaseName, unmanagedDatabase, and location.
More info: https://github.com/kubernetes-reporting/metering-operator/blob/master/Documentation/storagelocations.md
More info: https://github.com/kube-reporting/metering-operator/blob/master/Documentation/storagelocations.md
properties:
hive:
type: object
Expand Down
Loading

0 comments on commit 6248430

Please sign in to comment.