Skip to content

Commit

Permalink
Refactor project name to cloud-provider-ironcore (#337)
Browse files Browse the repository at this point in the history
  • Loading branch information
kasabe28 authored Nov 28, 2023
1 parent f3ae840 commit 3d5c7f6
Show file tree
Hide file tree
Showing 29 changed files with 266 additions and 268 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ updates:
interval: "daily"
open-pull-requests-limit: 10
reviewers:
- "onmetal/ccm-maintainers"
- "ironcore-dev/integration"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10
reviewers:
- "onmetal/ccm-maintainers"
- "ironcore-dev/integration"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10
reviewers:
- "onmetal/ccm-maintainers"
- "ironcore-dev/integration"
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: meta
with:
images: |
ghcr.io/${{ github.repository_owner }}/cloud-provider-onmetal
ghcr.io/${{ github.repository_owner }}/cloud-provider-ironcore
tags: |
type=semver,pattern={{version}}
type=schedule
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ dist/
dev/
config/kind/kubeconfig
config/kind/cloud-config
config/kind/onmetal/kubeconfig
config/kind/ironcore/kubeconfig
4 changes: 2 additions & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# onmetal-csi-driver maintainers
* @onmetal/ccm-maintainers
# cloud-provider-ironcore maintainers
* @ironcore-dev/integration
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Please refer to the [Gardener on Metal code of conduct](https://onmetal.github.io/documentation/contribute/overview/#code-of-conduct).
Please refer to the [IronCore code of conduct](https://ironcore-dev.github.io/documentation/contribute/overview/#code-of-conduct).
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ ARG TARGETARCH
# Build
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg \
CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -o manager ./cmd/cloud-provider-onmetal/main.go
CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -o manager ./cmd/cloud-provider-ironcore/main.go

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY --from=builder /workspace/manager /onmetal-cloud-controller-manager
COPY --from=builder /workspace/manager /ironcore-cloud-controller-manager
USER 65532:65532

ENTRYPOINT ["/onmetal-cloud-controller-manager"]
ENTRYPOINT ["/ironcore-cloud-controller-manager"]
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BIN_NAME = "cloud-provider-onmetal"
BIN_NAME = "cloud-provider-ironcore"
IMG ?= controller:latest

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
Expand Down Expand Up @@ -26,11 +26,11 @@ lint: golangci-lint ## Run golangci-lint on the code.

.PHONY: add-license
add-license: addlicense ## Add license headers to all go files.
find . -name '*.go' -exec $(ADDLICENSE) -c 'OnMetal authors' {} +
find . -name '*.go' -exec $(ADDLICENSE) -c 'IronCore authors' {} +

.PHONY: check-license
check-license: addlicense ## Check that every file has a license header present.
find . -name '*.go' -exec $(ADDLICENSE) -check -c 'OnMetal authors' {} +
find . -name '*.go' -exec $(ADDLICENSE) -check -c 'IronCore authors' {} +

.PHONY: check
check: add-license fmt lint test # Generate manifests, code, lint, add licenses, test
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# cloud-provider-onmetal
# cloud-provider-ironcore

[![Test](https://github.com/onmetal/cloud-provider-onmetal/actions/workflows/test.yml/badge.svg)](https://github.com/onmetal/cephlet/actions/workflows/test.yml)
[![Test](https://github.com/ironcore-dev/cloud-provider-ironcore/actions/workflows/test.yml/badge.svg)](https://github.com/ironcore-dev/ceph-provider/actions/workflows/test.yml)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://makeapullrequest.com)
[![GitHub License](https://img.shields.io/static/v1?label=License&message=Apache-2.0&color=blue&style=flat-square)](LICENSE)

The `cloud-provider-onmetal` is the [Kubernetes cloud provider](https://github.com/kubernetes/cloud-provider) implementation for Gardener on Metal.
The `cloud-provider-ironcore` is the [Kubernetes cloud provider](https://github.com/kubernetes/cloud-provider) implementation for IronCore.

## Installation, Usage, and Development

For more details please refer to documentation folder [/docs](https://github.com/onmetal/cloud-provider-onmetal/tree/main/docs)
For more details please refer to documentation folder [/docs](https://github.com/ironcore-dev/cloud-provider-ironcore/tree/main/docs)

## Feedback and Support

Feedback and contributions are always welcome!

Please report bugs, suggestions or post questions by opening a [Github issue](https://github.com/onmetal/cloud-provider-onmetal/issues).
Please report bugs, suggestions or post questions by opening a [Github issue](https://github.com/ironcore-dev/cloud-provider-ironcore/issues).

## License

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/onmetal/cloud-provider-onmetal/pkg/cloudprovider/onmetal"
"github.com/ironcore-dev/cloud-provider-ironcore/pkg/cloudprovider/ironcore"
"github.com/spf13/pflag"
"k8s.io/apimachinery/pkg/util/wait"
cloudprovider "k8s.io/cloud-provider"
Expand All @@ -42,7 +42,7 @@ func main() {
controllerInitializers := app.DefaultInitFuncConstructors
namedFlagSets := cliflag.NamedFlagSets{}

onmetal.AddExtraFlags(pflag.CommandLine)
ironcore.AddExtraFlags(pflag.CommandLine)

controllerAliases := names.CCMControllerAliases()

Expand All @@ -58,7 +58,7 @@ func cloudInitializer(config *cloudcontrollerconfig.CompletedConfig) cloudprovid
providerName := cloudConfig.Name

if providerName == "" {
providerName = onmetal.ProviderName
providerName = ironcore.ProviderName
}

// initialize cloud provider with the cloud provider name and config file provided
Expand Down
4 changes: 2 additions & 2 deletions config/config/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ kind: Secret
metadata:
labels:
k8s-app: cloud-controller-manager
name: onmetal-ccm
name: ironcore-ccm
stringData:
# onmetal-api kubeconfig goes here
# ironcore kubeconfig goes here
config.yaml: |-
4 changes: 2 additions & 2 deletions config/kind/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ secretGenerator:
- name: cloud-config
files:
- cloud-config
- name: onmetalkubeconfig
- name: ironcore-kubeconfig
files:
- onmetal/kubeconfig
- ironcore/kubeconfig

2 changes: 1 addition & 1 deletion config/kind/patch-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
namespace: kube-system
name: onmetal-cloud-controller-manager
name: ironcore-cloud-controller-manager
spec:
template:
spec:
Expand Down
22 changes: 11 additions & 11 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: onmetal-cloud-controller-manager
name: ironcore-cloud-controller-manager
labels:
k8s-app: onmetal-cloud-controller-manager
k8s-app: ironcore-cloud-controller-manager
spec:
replicas: 1
selector:
matchLabels:
k8s-app: onmetal-cloud-controller-manager
k8s-app: ironcore-cloud-controller-manager
template:
metadata:
labels:
k8s-app: onmetal-cloud-controller-manager
k8s-app: ironcore-cloud-controller-manager
spec:
serviceAccountName: cloud-controller-manager
hostNetwork: true
containers:
- name: manager
command:
- /onmetal-cloud-controller-manager
- /ironcore-cloud-controller-manager
args:
- --cloud-provider=onmetal
- --cloud-provider=ironcore
- --cloud-config=/etc/cloud/cloud-config
- --onmetal-kubeconfig=/etc/onmetal/kubeconfig
- --ironcore-kubeconfig=/etc/ironcore/kubeconfig
- --kubeconfig=/etc/kubernetes/kubeconfig
- --authentication-kubeconfig=/etc/kubernetes/kubeconfig
- --authorization-kubeconfig=/etc/kubernetes/kubeconfig
Expand Down Expand Up @@ -55,8 +55,8 @@ spec:
- mountPath: /etc/kubernetes
name: kubeconfig
readOnly: true
- mountPath: /etc/onmetal
name: onmetalkubeconfig
- mountPath: /etc/ironcore
name: ironcore-kubeconfig
readOnly: true
- mountPath: /etc/cloud
name: cloud-config
Expand All @@ -75,8 +75,8 @@ spec:
secretName: kubeconfig
name: kubeconfig
- secret:
secretName: onmetalkubeconfig
name: onmetalkubeconfig
secretName: ironcore-kubeconfig
name: ironcore-kubeconfig
- configMap:
name: kube-root-ca.crt
items:
Expand Down
24 changes: 12 additions & 12 deletions docs/deployment/deploy_manually.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,38 @@
$ systemctl restart kubelet
```
## Steps to Deploy "Cloud-provider-onmetal"
* To deploy clone the repository [cloud-provider-onmetal](https://github.com/onmetal/cloud-provider-onmetal)
## Steps to Deploy "Cloud-provider-ironcore"
* To deploy clone the repository [cloud-provider-ironcore](https://github.com/ironcore-dev/cloud-provider-ironcore)
```shell
git clone [email protected]:onmetal/cloud-provider-onmetal.git
cd cloud-provider-onmetal
git clone [email protected]:ironcore-dev/cloud-provider-ironcore.git
cd cloud-provider-ironcore
```
* Create folder ``config/kind/onmetal`` and create kubeconfig into folder ``config/kind/onmetal/kubeconfig``.
* Create folder ``config/kind/ironcore`` and create kubeconfig into folder ``config/kind/ironcore/kubeconfig``.

If you want to use onmetal-api server from different cluster then copy kubeconfig of that cluster into folder ``config/kind/onmetal/kubeconfig``
If you want to use ironcore server from different cluster then copy kubeconfig of that cluster into folder ``config/kind/ironcore/kubeconfig``

If you want to use onmetal-api server from local deployment then copy kubeconfig into folder ``config/kind/onmetal/kubeconfig`` using below command
If you want to use ironcore server from local deployment then copy kubeconfig into folder ``config/kind/ironcore/kubeconfig`` using below command
```shell
kind get kubeconfig > ./config/kind/onmetal/kubeconfig
kind get kubeconfig > ./config/kind/ironcore/kubeconfig
```
* Copy kubeconfig into folder ``config/kind/kubeconfig``
```shell
kind get kubeconfig > ./config/kind/kubeconfig
```
* Create cloud-config file under ``./config/kind/`` with the help of sample file present under ``./config/sample/cloud-config``

**Note**: The kubeconfig content here is your onmetal-api cluster's kubeconfig incase of a real kubeadm cluster deployment
**Note**: The kubeconfig content here is your ironcore-api cluster's kubeconfig incase of a real kubeadm cluster deployment

* Run below make target to deploy the ``cloud-provider-onmetal``
* Run below make target to deploy the ``cloud-provider-ironcore``
```shell
make docker-build
kustomize build config/kind | kubectl apply -f -
```
**Validation:**
```
kubectl get po -n kube-system -o wide| grep onmetal
onmetal-cloud-controller-manager-crws9 1/1 Running 4 (80s ago) 4m13s 10.244.225.76 csi-master
kubectl get po -n kube-system -o wide| grep ironcore
ironcore-cloud-controller-manager-crws9 1/1 Running 4 (80s ago) 4m13s 10.244.225.76 csi-master
```

**Note**: In case that there are multiple environments running, ensure that `kind get clusters` is pointing to the
Expand Down
8 changes: 4 additions & 4 deletions docs/development/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

## Clone the Repository

To bring up and start locally the `cloud-provider-onmetal` project for development purposes you first need to clone the repository.
To bring up and start locally the `cloud-provider-ironcore` project for development purposes you first need to clone the repository.

```shell
git clone [email protected]:onmetal/cloud-provider-onmetal.git
cd cloud-provider-onmetal
git clone [email protected]:ironcore-dev/cloud-provider-ironcore.git
cd cloud-provider-ironcore
```

## Install cloud-provider-onmetal into the kind Cluster
## Install cloud-provider-ironcore into the kind Cluster
For local development with `kind` follow below steps

Copy kubeconfig to apply the config in kind
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/onmetal/cloud-provider-onmetal
module github.com/ironcore-dev/cloud-provider-ironcore

go 1.21

require (
github.com/onmetal/controller-utils v0.8.3
github.com/onmetal/onmetal-api v0.1.2-0.20231006124132-8ad37e778d15
github.com/ironcore-dev/controller-utils v0.9.0
github.com/ironcore-dev/ironcore v0.1.2-0.20231120144059-30dd02e88870
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/gomega v1.30.0
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -69,7 +69,7 @@ require (
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
Expand All @@ -90,7 +90,7 @@ require (
golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
Expand All @@ -107,14 +107,14 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.28.3 // indirect
k8s.io/apiextensions-apiserver v0.28.4 // indirect
k8s.io/apiserver v0.28.4 // indirect
k8s.io/component-helpers v0.28.4 // indirect
k8s.io/kms v0.28.4 // indirect
k8s.io/kube-aggregator v0.28.2 // indirect
k8s.io/kube-aggregator v0.28.4 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading

0 comments on commit 3d5c7f6

Please sign in to comment.