Skip to content

Commit 890675f

Browse files
committed
Secondary range testing
1 parent f24b413 commit 890675f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Tiltfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ FROM golang:1.18 as tilt-helper
102102
# Support live reloading with Tilt
103103
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
104104
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \
105-
chmod +x /start.sh && chmod +x /restart.sh
105+
chmod +x /start.sh && chmod +x /restart.sh && \
106+
touch /process.txt && chmod 0666 /process.txt `# pre-create PID file to allow even non-root users to run the image`
106107
"""
107108

108109
tilt_dockerfile_header = """
109110
FROM gcr.io/distroless/base:debug as tilt
110111
WORKDIR /
111112
COPY --from=tilt-helper /start.sh .
112113
COPY --from=tilt-helper /restart.sh .
114+
COPY --from=tilt-helper /process.txt .
113115
COPY manager .
114116
"""
115117

cloud/services/container/clusters/reconcile.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ func (s *Service) createCluster(ctx context.Context, log *logr.Logger) error {
275275
if cn.UseIPAliases {
276276
cluster.IpAllocationPolicy = &containerpb.IPAllocationPolicy{}
277277
cluster.IpAllocationPolicy.UseIpAliases = cn.UseIPAliases
278+
cluster.IpAllocationPolicy.ClusterIpv4CidrBlock = cn.Pod.CidrBlock
279+
cluster.IpAllocationPolicy.ServicesIpv4CidrBlock = cn.Service.CidrBlock
278280
}
279281
if cn.PrivateCluster != nil {
280282
cluster.PrivateClusterConfig = &containerpb.PrivateClusterConfig{}

0 commit comments

Comments
 (0)