Skip to content

Commit

Permalink
rebranding config/* except service-accounts
Browse files Browse the repository at this point in the history
  • Loading branch information
Tonni Follmann committed Feb 28, 2024
1 parent 197f4ae commit df22ec0
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY utils/ utils/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
go build -gcflags=all="-N -l" \
-ldflags "-X main.BuildSHA='${BUILD_SHA}' -X main.BuildVersion='${BUILD_VERSION}'" \
-a -o tf-controller ./cmd/manager
-a -o tofu-controller ./cmd/manager

FROM alpine:3.18

Expand All @@ -48,12 +48,12 @@ RUN apk update && \
libretls \
busybox

COPY --from=builder /workspace/tf-controller /usr/local/bin/
COPY --from=builder /workspace/tofu-controller /usr/local/bin/

RUN addgroup --gid 65532 -S controller && adduser --uid 65532 -S controller -G controller

USER 65532:65532

ENV GNUPGHOME=/tmp

ENTRYPOINT [ "/sbin/tini", "--", "tf-controller" ]
ENTRYPOINT [ "/sbin/tini", "--", "tofu-controller" ]
4 changes: 2 additions & 2 deletions config/branch-planner/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ resources:
generatorOptions:
disableNameSuffixHash: true
images:
- name: weaveworks/branch-planner
newName: ghcr.io/weaveworks/branch-planner
- name: flux-iac/branch-planner
newName: ghcr.io/flux-iac/branch-planner
newTag: v0.16.0-rc.3
16 changes: 8 additions & 8 deletions config/branch-planner/planner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app.kubernetes.io/name: tf-controller-planner
app.kubernetes.io/instance: tf-controller
app.kubernetes.io/name: tofu-controller-planner
app.kubernetes.io/instance: tofu-controller
name: branch-planner
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: tf-controller-planner
app.kubernetes.io/instance: tf-controller
app.kubernetes.io/name: tofu-controller-planner
app.kubernetes.io/instance: tofu-controller
template:
metadata:
labels:
app.kubernetes.io/name: tf-controller-planner
app.kubernetes.io/instance: tf-controller
app.kubernetes.io/name: tofu-controller-planner
app.kubernetes.io/instance: tofu-controller
spec:
containers:
- args: []
# Update the env variables according to your new deployment
image: "ghcr.io/weaveworks/branch-planner:v0.15.0-rc.5"
image: "ghcr.io/flux-iac/branch-planner:v0.15.0-rc.5"
imagePullPolicy: IfNotPresent
name: tf-controller
name: tofu-controller
ports:
- containerPort: 8080
name: http-prom
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: tf-system
namespace: tofu-system
resources:
- https://github.com/fluxcd/source-controller/releases/download/v1.0.0-rc.1/source-controller.crds.yaml
- https://github.com/fluxcd/source-controller/releases/download/v1.0.0-rc.1/source-controller.deployment.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/default/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ kind: Namespace
metadata:
labels:
control-plane: controller
name: tf-system
name: tofu-system
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
control-plane: tofu-controller
spec:
terminationGracePeriodSeconds: 10
serviceAccountName: tofu-controller
serviceAccountName: tf-controller
securityContext:
fsGroup: 1337
containers:
Expand Down
2 changes: 1 addition & 1 deletion config/package/aws-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
name: aws-package
spec:
interval: 1h0m0s
url: oci://ghcr.io/tf-controller/aws-primitive-modules
url: oci://ghcr.io/flux-iac/aws-primitive-modules
ref:
tag: v4.38.0-v1alpha11
2 changes: 1 addition & 1 deletion config/samples/infra_v1alpha2_terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: flux-system
spec:
interval: 30s
url: https://github.com/tf-controller/helloworld
url: https://github.com/flux-iac/helloworld
ref:
branch: main
---
Expand Down

0 comments on commit df22ec0

Please sign in to comment.