Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- 'feature/**'
- 'feat/**'
- 'fix/**'
pull_request:
types: [opened, reopened]
Expand Down
24 changes: 23 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ helmfile apply -f helm/helmfile.yaml -e dev # example env

## USAGE

<details><summary>EXAMPLE CR</summary>
<details><summary>CREATE CR</summary>

```bash
kubectl apply -f - <<EOF
Expand Down Expand Up @@ -67,6 +67,28 @@ EOF

</details>

<details><summary>CLI</summary>

### GET IPS

```bash
machineshop get \
--system=ips \
--destination=clusterbook.172.18.0.5.nip.io \
--path=10.31.103 \
--output=2
```

```bash
machineshop push \
--target=ips \
--destination=clusterbook.172.18.0.5.nip.io \
--artifacts="10.31.103.9;10.31.103.10" \
--assignee=app1
```

</details>

## DEV TASKS

```bash
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ tasks:
RELEASE_IMAGE: ghcr.io/stuttgart-things/clusterbook/clusterbook
VERSION:
sh: |
[ "$(git branch --show-current)" != "main" ] && echo "dev-$(git describe --tags --abbrev=0)" || echo $(git describe --tags --abbrev=0)
[ "$(git branch --show-current)" != "main" ] && echo "$(git describe --tags --abbrev=0)-dev" || echo $(git describe --tags --abbrev=0)

proto:
desc: Generate Go code from proto
Expand Down
4 changes: 2 additions & 2 deletions helm/clusterbook/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: clusterbook
description: A Helm chart for Kubernetes
type: application
version: dev-v1.3.1-chart
appVersion: dev-v1.3.1
version: v1.4.0-dev-chart
appVersion: v1.4.0-dev
dependencies:
- name: sthings-helm-toolkit
version: 2.4.74
Expand Down
2 changes: 1 addition & 1 deletion helm/clusterbook/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ deployment:
image: ghcr.io/stuttgart-things/clusterbook/clusterbook-5f3bb9105a15fafb0e52842968611a61@sha256
replicaCount: 1
imagePullPolicy: Always
tag: bffec9f6a5bfe35959616809444e767be96bd6f4a124fd543c1b5738091b81f6 # pragma: allowlist secret
tag: ab1ac7fb7873d31fe0fd2c2818b2beb7387e9c789b2b4c09626d72e1003355a7 # pragma: allowlist secret
securityContext:
capabilities: {}

Expand Down
6 changes: 3 additions & 3 deletions helm/env/dev.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
enableIngress: true
enableCertificateRequest: true
ingressDomain: fluxdev-3.sthings-vsphere.labul.sva.de #rke2.sthings-vsphere.labul.sva.de
ingressDomain: 172.18.0.5.nip.io #rke2.sthings-vsphere.labul.sva.de
issuerKind: ClusterIssuer
issuerName: vault-approle
imageTag: bffec9f6a5bfe35959616809444e767be96bd6f4a124fd543c1b5738091b81f6 # pragma: allowlist secret
issuerName: selfsigned
imageTag: ab1ac7fb7873d31fe0fd2c2818b2beb7387e9c789b2b4c09626d72e1003355a7 # pragma: allowlist secret
6 changes: 0 additions & 6 deletions helm/env/kind.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions helm/helmfile.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
environments:
kind:
values:
- env/defaults.yaml
- env/{{ .Environment.Name }}.yaml
dev:
values:
- env/defaults.yaml
Expand Down
Empty file removed helmfile.yaml
Empty file.
3 changes: 3 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ func (s *server) SetClusterInfo(ctx context.Context, req *ipservice.ClusterReque
fmt.Println(ipList)
status := fmt.Sprintf("CLUSTER %s SET WITH IP RANGE %s AND STATUS %s", req.ClusterName, req.IpAddressRange, req.Status)

// CONVERT THE STATUS TO UPPERCASE
status = strings.ToUpper(status)

// SAVE YAML FILE
switch loadConfigFrom {
case "disk":
Expand Down
3 changes: 2 additions & 1 deletion tests/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ func getCredentials() grpc.DialOption {
}

func main() {

GetIps(2, "10.31.103")
SetIpStatus("10.31.103.7", "ipat", "reserved")
// DELETE RESERVATION
SetIpStatus("10.31.103.4", "", "")
}

func GetIps(countIps int32, networkKey string) {
Expand Down