Skip to content

Commit eec6091

Browse files
Merge pull request #996 from dmage/local-dev
NO-JIRA: Add hack/local-dev.sh
2 parents 4cd367a + 930f96b commit eec6091

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

cmd/cluster-image-registry-operator/main.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ import (
2424

2525
const metricsPort = 60000
2626

27-
var filesToWatch []string
27+
var (
28+
kubeconfig string
29+
filesToWatch []string
30+
)
2831

2932
func printVersion() {
3033
klog.Infof("Cluster Image Registry Operator Version: %s", version.Version)
@@ -64,6 +67,8 @@ func main() {
6467
go metrics.RunServer(metricsPort)
6568
return operator.RunOperator(ctx, cctx.KubeConfig)
6669
},
70+
).WithKubeConfigFile(
71+
kubeconfig, nil,
6772
).WithLeaderElection(
6873
configv1.LeaderElection{},
6974
defaults.ImageRegistryOperatorNamespace,
@@ -78,6 +83,7 @@ func main() {
7883
},
7984
}
8085

86+
cmd.Flags().StringVar(&kubeconfig, "kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster")
8187
cmd.Flags().StringArrayVar(&filesToWatch, "files", []string{}, "List of files to watch")
8288

8389
if err := cmd.Execute(); err != nil {

hack/local-dev.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh -eu
2+
HACKDIR="$(dirname "$0")"
3+
"$HACKDIR/add-cvo-overrides.sh"
4+
oc scale --replicas=0 deploy/cluster-image-registry-operator -n openshift-image-registry
5+
ENV=$(
6+
oc -n openshift-image-registry get deploy cluster-image-registry-operator -o json |
7+
jq -r '
8+
.spec.template.spec.containers[0].env[] |
9+
if .valueFrom.fieldRef.fieldPath == "metadata.namespace" then del(.valueFrom) | .value = "openshift-image-registry"
10+
elif .valueFrom.fieldRef.fieldPath == "metadata.name" then del(.valueFrom) | .value = "cluster-image-registry-operator"
11+
else . end |
12+
"\(.name)=\(.value)"
13+
'
14+
)
15+
"$HACKDIR/build/build.sh"
16+
exec env $ENV "$HACKDIR/../tmp/_output/bin/cluster-image-registry-operator" --kubeconfig="${KUBECONFIG:-$HOME/.kube/config}"

0 commit comments

Comments
 (0)