Skip to content

Commit

Permalink
Rename K8 pods/services from "flv" to "fluvio" (#591)
Browse files Browse the repository at this point in the history
* delete old files

* rename k8 pods and services from flv to fluvio
  • Loading branch information
nacardin authored Dec 21, 2020
1 parent 6b4894c commit c700615
Show file tree
Hide file tree
Showing 30 changed files with 23 additions and 240 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Depending on your setup, here's how you can get the logs:
- Run `cat /usr/local/var/log/fluvio/spu_log_XXXX.log` for each SPU
- E.g. when running 1 SPU, there will be `spu_log_5001.log`
- For a Fluvio installation on Minikube:
- Run `kubectl logs flv-sc` for SC logs
- Run `kubectl logs flv-spg-main-X` for each SPU
- Run `kubectl logs fluvio-sc` for SC logs
- Run `kubectl logs fluvio-spg-main-X` for each SPU

**Environment (please complete the following information):**
- OS: [e.g. Linux, Mac]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ jobs:
- run: minikube delete
- name: Save logs
if: failure()
run: kubectl logs flv-sc > /tmp/flv_sc.log
run: kubectl logs fluvio-sc > /tmp/flv_sc.log
- name: Upload logs
timeout-minutes: 10
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ error: linker `x86_64-linux-musl-gcc` not found
|
= note: No such file or directory (os error 2)
error: aborting due to previous error
error: could not compile `flv-spu`.
error: could not compile `fluvio-spu`.
```
This is indicative that you need to add standard library for the target platform:

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ smoke-test-k8-tls-policy: test-clean-up minikube_image
--authorization-config-map authorization \
${SKIP_CHECK}

test-permission-k8: SC_HOST=$(shell kubectl get svc flv-sc-public -o json | jq '.status.loadBalancer.ingress[0].ip' | tr -d '"' )
test-permission-k8: SC_HOST=$(shell kubectl get svc fluvio-sc-public -o json | jq '.status.loadBalancer.ingress[0].ip' | tr -d '"' )
test-permission-k8: test-permission-user1

smoke-test-k8-tls-root: smoke-test-k8-tls-policy test-permission-k8
Expand Down
10 changes: 0 additions & 10 deletions k8-util/crd/config/gp2-storageclass-spu.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions k8-util/crd/config/local-storageclass.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions k8-util/crd/config/minikube-storageclass-spu.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions k8-util/crd/config/persistent_volume_claim_spu.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions k8-util/crd/init.sh

This file was deleted.

6 changes: 0 additions & 6 deletions k8-util/deploy.sh

This file was deleted.

6 changes: 3 additions & 3 deletions k8-util/helm/fluvio-app/templates/sc-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: v1
kind: Pod
metadata:
name: flv-sc
name: fluvio-sc
labels:
app: flv-sc
app: fluvio-sc
spec:
serviceAccountName: {{ .Values.serviceAccount.name }}
containers:
- name: flv-sc
- name: fluvio-sc
image: {{ .Values.image.registry }}/fluvio:{{ .Values.image.tag | default .Chart.Version }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
Expand Down
4 changes: 2 additions & 2 deletions k8-util/helm/fluvio-app/templates/sc-internal.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: flv-sc-internal
name: fluvio-sc-internal
spec:
selector:
app: flv-sc
app: fluvio-sc
ports:
- protocol: TCP
port: 9004
Expand Down
4 changes: 2 additions & 2 deletions k8-util/helm/fluvio-app/templates/sc-public.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Service
metadata:
name: flv-sc-public
name: fluvio-sc-public
spec:
type: LoadBalancer
externalTrafficPolicy: Local
selector:
app: flv-sc
app: fluvio-sc
ports:
- protocol: TCP
port: 9003
Expand Down
6 changes: 0 additions & 6 deletions k8-util/install.sh

This file was deleted.

22 changes: 0 additions & 22 deletions k8-util/operator-templates/spu-service.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions k8-util/operator-templates/spu-stateful-patch.yaml

This file was deleted.

46 changes: 0 additions & 46 deletions k8-util/operator-templates/spu-stateful.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions k8-util/operator-templates/spu0-exteranl-service.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions k8-util/operator-templates/spu1-exteranl-service.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions k8-util/operator-templates/spu2-exteranl-service.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions k8-util/sc-deployment/flv_namespace.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions k8-util/sc-deployment/flv_set_context_minikube.sh

This file was deleted.

16 changes: 0 additions & 16 deletions k8-util/sc-deployment/sc-deployment-debug.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions k8-util/sc-deployment/sc-internal-dev.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion src/cli/src/profile/sync/k8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ pub async fn discover_fluvio_addr(namespace: Option<&str>) -> Result<Option<Stri

let ns = namespace.unwrap_or("default");
let svc = match K8Client::default()?
.retrieve_item::<ServiceSpec, _>(&InputObjectMeta::named("flv-sc-public", ns))
.retrieve_item::<ServiceSpec, _>(&InputObjectMeta::named("fluvio-sc-public", ns))
.await
{
Ok(svc) => svc,
Expand Down
2 changes: 1 addition & 1 deletion src/cluster/src/delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ impl ClusterUninstaller {

let client = load_and_share().map_err(UninstallError::K8ClientError)?;

let sc_pod = InputObjectMeta::named("flv-sc", &self.config.namespace);
let sc_pod = InputObjectMeta::named("fluvio-sc", &self.config.namespace);
self.wait_for_delete::<PodSpec>(client, &sc_pod).await?;
self.cleanup().await?;

Expand Down
2 changes: 1 addition & 1 deletion src/cluster/src/start/k8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ impl ClusterInstaller {

let result = self
.kube_client
.retrieve_item::<ServiceSpec, _>(&InputObjectMeta::named("flv-sc-public", ns))
.retrieve_item::<ServiceSpec, _>(&InputObjectMeta::named("fluvio-sc-public", ns))
.await;

let svc = match result {
Expand Down
4 changes: 2 additions & 2 deletions src/sc/src/k8/operator/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn convert_cluster_to_statefulset(
namespace: &str,
tls: Option<&TlsConfig>,
) -> InputK8Obj<StatefulSetSpec> {
let statefulset_name = format!("flv-spg-{}", group_name);
let statefulset_name = format!("fluvio-spg-{}", group_name);
let spec = generate_stateful(group_spec, group_name, group_svc_name, namespace, tls);
let owner_ref = metadata.make_owner_reference::<K8SpuGroupSpec>();

Expand Down Expand Up @@ -102,7 +102,7 @@ fn generate_stateful(
"spu".to_owned(),
"--sc-addr".to_owned(),
format!(
"flv-sc-internal.{}.svc.cluster.local:{}",
"fluvio-sc-internal.{}.svc.cluster.local:{}",
namespace, SC_PRIVATE_PORT
),
"--log-base-dir".to_owned(),
Expand Down
Loading

0 comments on commit c700615

Please sign in to comment.