Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rm-unused-secret #433

Merged
merged 1 commit into from
Jun 11, 2024
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
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,6 @@ Apply the configuration file above once the values for your environment are defi
```
kubectl apply -n securesign -f rhtas-deployment.yaml
```
Because an image of netcat is used from `registry.redhat.io` it is required to provide credentials to registry.redhat.io. The below assumes that an authentication file has been created in the `/tmp` directory.

```
kubectl create secret generic pull-secret -n securesign --from-file=.dockerconfigjson=/tmp/config.json --type=kubernetes.io/dockerconfigjson
```


### Verifying signatures
To verify RHTAS is working as expected we will initialize to TUF.
Expand Down
2 changes: 0 additions & 2 deletions controllers/constants/config.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package constants



var (
CreateTreeDeadline int64 = 1200
)
5 changes: 0 additions & 5 deletions controllers/ctlog/actions/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog) *
Namespace: instance.Namespace,
Labels: labels,
},
ImagePullSecrets: []v1.LocalObjectReference{
{
Name: "pull-secret",
},
},
}

if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil {
Expand Down
5 changes: 0 additions & 5 deletions controllers/fulcio/actions/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Fulcio)
Namespace: instance.Namespace,
Labels: labels,
},
ImagePullSecrets: []v1.LocalObjectReference{
{
Name: "pull-secret",
},
},
}

if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil {
Expand Down
5 changes: 0 additions & 5 deletions controllers/rekor/actions/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Rekor) *
Namespace: instance.Namespace,
Labels: labels,
},
ImagePullSecrets: []v1.LocalObjectReference{
{
Name: "pull-secret",
},
},
}

if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil {
Expand Down
5 changes: 0 additions & 5 deletions controllers/trillian/actions/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Trillian
Namespace: instance.Namespace,
Labels: labels,
},
ImagePullSecrets: []v1.LocalObjectReference{
{
Name: "pull-secret",
},
},
}

if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil {
Expand Down
5 changes: 0 additions & 5 deletions controllers/tuf/actions/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Tuf) *ac
Namespace: instance.Namespace,
Labels: labels,
},
ImagePullSecrets: []v1.LocalObjectReference{
{
Name: "pull-secret",
},
},
}

if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions e2e/cli_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ const cliServerNs = "trusted-artifact-signer"

var _ = Describe("CliServer", Ordered, func() {
var (
cli ctrl.Client
cli ctrl.Client
httpClient *http.Client
url string
ctx = context.TODO()
url string
ctx = context.TODO()
)

BeforeAll(func() {
Expand Down
3 changes: 1 addition & 2 deletions hack/up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,4 @@ do
sleep 10
done

make deploy && kubectl create -f config/samples/rhtas_v1alpha1_securesign.yaml && sleep 30 && kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-ctlog-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-fulcio-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-rekor-system ;kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-rekor-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-trillian-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-trillian-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-trusted-artifact-signer-clientserver ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-tuf-system

make deploy && kubectl create -f config/samples/rhtas_v1alpha1_securesign.yaml
Loading